diff --git a/flag.services.yml b/flag.services.yml
index 76685b4..88e351f 100644
--- a/flag.services.yml
+++ b/flag.services.yml
@@ -14,5 +14,5 @@ services:
     tags:
       - { name: event_subscriber }
   flag.link_builder:
-    class: Drupal\flag\LazyLinkBuilder
+    class: Drupal\flag\FlagLinkBuilder
     arguments: ['@entity.manager', '@flag']
diff --git a/src/LazyLinkBuilder.php b/src/FlagLinkBuilder.php
similarity index 92%
rename from src/LazyLinkBuilder.php
rename to src/FlagLinkBuilder.php
index 676f969..a46813e 100644
--- a/src/LazyLinkBuilder.php
+++ b/src/FlagLinkBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\flag\LazyLinkBuilder.
+ * Contains Drupal\flag\FlagLinkBuilder.
  */
 
 namespace Drupal\flag;
@@ -11,11 +11,11 @@ use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\flag\FlagServiceInterface;
 
 /**
- * Class LinkBuilder.
+ * Class FlagLinkBuilder.
  *
  * @package Drupal\flag
  */
-class LazyLinkBuilder implements LazyLinkBuilderInterface {
+class FlagLinkBuilder implements FlagLinkBuilderInterface {
 
   /**
    * The entity manager.
diff --git a/src/LazyLinkBuilderInterface.php b/src/FlagLinkBuilderInterface.php
similarity index 83%
rename from src/LazyLinkBuilderInterface.php
rename to src/FlagLinkBuilderInterface.php
index be70ac7..02bdbe0 100644
--- a/src/LazyLinkBuilderInterface.php
+++ b/src/FlagLinkBuilderInterface.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains Drupal\flag\LazyLinkBuilderInterface.
+ * Contains Drupal\flag\FlagLinkBuilderInterface.
  */
 
 namespace Drupal\flag;
 
 /**
- * Interface LinkBuilderInterface.
+ * Interface FlagLinkBuilderInterface.
  *
  * @package Drupal\flag
  */
-interface LazyLinkBuilderInterface {
+interface FlagLinkBuilderInterface {
 
   /**
    * Lazy builder callback for displaying a flag action link.