diff --git a/modules/ui_patterns_library/src/Plugin/Deriver/LibraryDeriver.php b/modules/ui_patterns_library/src/Plugin/Deriver/LibraryDeriver.php
index 84cf2a6fca5b73a0dd99527903a252031d354cc6..65d2b117254b8c17b7a7a24013a7e9022ee14d24 100644
--- a/modules/ui_patterns_library/src/Plugin/Deriver/LibraryDeriver.php
+++ b/modules/ui_patterns_library/src/Plugin/Deriver/LibraryDeriver.php
@@ -5,7 +5,7 @@ namespace Drupal\ui_patterns_library\Plugin\Deriver;
 use Drupal\Component\Serialization\Yaml;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\Core\TypedData\TypedDataManager;
-use Drupal\ui_patterns\Plugin\Deriver\AbstractYamlDeriver;
+use Drupal\ui_patterns\Plugin\Deriver\AbstractYamlPatternsDeriver;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Extension\ThemeHandlerInterface;
@@ -15,7 +15,7 @@ use Drupal\Core\Extension\ThemeHandlerInterface;
  *
  * @package Drupal\ui_patterns_library\Deriver
  */
-class LibraryDeriver extends AbstractYamlDeriver {
+class LibraryDeriver extends AbstractYamlPatternsDeriver {
 
   /**
    * The base plugin ID.
diff --git a/src/Plugin/Deriver/AbstractDeriver.php b/src/Plugin/Deriver/AbstractPatternsDeriver.php
similarity index 91%
rename from src/Plugin/Deriver/AbstractDeriver.php
rename to src/Plugin/Deriver/AbstractPatternsDeriver.php
index c8af320029b8e6eef25e65a92b6bf7cab9e9a910..1ca4bbd8d954200e1f67d659566484b2556c6fb0 100644
--- a/src/Plugin/Deriver/AbstractDeriver.php
+++ b/src/Plugin/Deriver/AbstractPatternsDeriver.php
@@ -8,11 +8,11 @@ use Drupal\Core\TypedData\TypedDataManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class AbstractDeriver.
+ * Class AbstractPatternsDeriver.
  *
  * @package Drupal\ui_patterns\Deriver
  */
-abstract class AbstractDeriver extends DeriverBase implements DeriverInterface, ContainerDeriverInterface {
+abstract class AbstractPatternsDeriver extends DeriverBase implements PatternsDeriverInterface, ContainerDeriverInterface {
 
   /**
    * Typed data manager service.
@@ -29,7 +29,7 @@ abstract class AbstractDeriver extends DeriverBase implements DeriverInterface,
   protected $dataType = 'ui_patterns_pattern';
 
   /**
-   * AbstractDeriver constructor.
+   * AbstractPatternsDeriver constructor.
    *
    * @param string $base_plugin_id
    *   The base plugin ID.
diff --git a/src/Plugin/Deriver/AbstractYamlDeriver.php b/src/Plugin/Deriver/AbstractYamlPatternsDeriver.php
similarity index 87%
rename from src/Plugin/Deriver/AbstractYamlDeriver.php
rename to src/Plugin/Deriver/AbstractYamlPatternsDeriver.php
index f45a87e868af25b4f6f86dde37a376a83fc1829b..2a2bb9fdceeb295662925bafeb6073b1ab0f673a 100644
--- a/src/Plugin/Deriver/AbstractYamlDeriver.php
+++ b/src/Plugin/Deriver/AbstractYamlPatternsDeriver.php
@@ -5,13 +5,13 @@ namespace Drupal\ui_patterns\Plugin\Deriver;
 use Drupal\Core\Site\Settings;
 
 /**
- * Class AbstractPatternsDeriver.
+ * Class AbstractYamlPatternsDeriver.
  *
  * Derive pattern plugin definitions stored in YAML files.
  *
  * @package Drupal\ui_patterns\Deriver
  */
-abstract class AbstractYamlDeriver extends AbstractDeriver implements YamlDeriverInterface, DeriverInterface {
+abstract class AbstractYamlPatternsDeriver extends AbstractPatternsDeriver implements YamlPatternsDeriverInterface {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/Deriver/DeriverInterface.php b/src/Plugin/Deriver/PatternsDeriverInterface.php
similarity index 80%
rename from src/Plugin/Deriver/DeriverInterface.php
rename to src/Plugin/Deriver/PatternsDeriverInterface.php
index 16cad59fdd3ec9e428f23071380d2a19b902a31a..28dd1ed0ad784825835e800db3fb50dc2a1c1ed3 100644
--- a/src/Plugin/Deriver/DeriverInterface.php
+++ b/src/Plugin/Deriver/PatternsDeriverInterface.php
@@ -3,11 +3,11 @@
 namespace Drupal\ui_patterns\Plugin\Deriver;
 
 /**
- * Interface DeriverInterface.
+ * Interface PatternsDeriverInterface.
  *
  * @package Drupal\ui_patterns\Plugin\Deriver
  */
-interface DeriverInterface {
+interface PatternsDeriverInterface {
 
   /**
    * Get pattern definition objects.
diff --git a/src/Plugin/Deriver/YamlDeriverInterface.php b/src/Plugin/Deriver/YamlPatternsDeriverInterface.php
similarity index 78%
rename from src/Plugin/Deriver/YamlDeriverInterface.php
rename to src/Plugin/Deriver/YamlPatternsDeriverInterface.php
index c8dc10f4bf0710a488356ccb7f90c8dcb2cf8dc1..947f8c525b2be58fdb648ebe5d37168f9af8a488 100644
--- a/src/Plugin/Deriver/YamlDeriverInterface.php
+++ b/src/Plugin/Deriver/YamlPatternsDeriverInterface.php
@@ -3,11 +3,11 @@
 namespace Drupal\ui_patterns\Plugin\Deriver;
 
 /**
- * Interface YamlDeriverInterface.
+ * Interface YamlPatternsDeriverInterface.
  *
  * @package Drupal\ui_patterns\Plugin\Deriver
  */
-interface YamlDeriverInterface {
+interface YamlPatternsDeriverInterface extends PatternsDeriverInterface {
 
   /**
    * Get list of possible yaml definition file extensions.