diff --git a/src/Plugin/ResourceFieldEnhancerManager.php b/src/Plugin/ResourceFieldEnhancerManager.php
index b01ca03c34b4cf194b98d5adbfad2f53cd7d3548..91287c6b608cc13044c4bfaa2da009e3fbaecf96 100644
--- a/src/Plugin/ResourceFieldEnhancerManager.php
+++ b/src/Plugin/ResourceFieldEnhancerManager.php
@@ -6,14 +6,17 @@ use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\DefaultPluginManager;
 
+/**
+ * Manages discovery and instantiation of resourceFieldEnhancer plugins.
+ */
 class ResourceFieldEnhancerManager extends DefaultPluginManager {
 
   /**
-   * Constructs a new TipPluginManager.
+   * Constructs a new ResourceFieldEnhancerManager.
    *
    * @param \Traversable $namespaces
    *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations,
+   *   keyed by the corresponding namespace to look for plugin implementations.
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
    *   Cache backend instance to use.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
@@ -21,7 +24,7 @@ class ResourceFieldEnhancerManager extends DefaultPluginManager {
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
     parent::__construct(
-      'Plugin/resourceFieldEnhancer',
+      'Plugin/jsonapi/FieldEnhancer',
       $namespaces,
       $module_handler,
       'Drupal\jsonapi_extras\Plugin\ResourceFieldEnhancerInterface',
diff --git a/src/Plugin/resourceFieldEnhancer/DateTimeEnhancer.php b/src/Plugin/jsonapi/FieldEnhancer/DateTimeEnhancer.php
similarity index 97%
rename from src/Plugin/resourceFieldEnhancer/DateTimeEnhancer.php
rename to src/Plugin/jsonapi/FieldEnhancer/DateTimeEnhancer.php
index e9b171b581c692dbc05a13b1aa1bef2af72ca34d..4f5aee22dda3a245bfa0105b2fe6238800077b02 100644
--- a/src/Plugin/resourceFieldEnhancer/DateTimeEnhancer.php
+++ b/src/Plugin/jsonapi/FieldEnhancer/DateTimeEnhancer.php
@@ -1,7 +1,6 @@
 <?php
 
-
-namespace Drupal\jsonapi_extras\Plugin\resourceFieldEnhancer;
+namespace Drupal\jsonapi_extras\Plugin\jsonapi\FieldEnhancer;
 
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Plugin\PluginBase;
diff --git a/src/Plugin/resourceFieldEnhancer/SingleNestedEnhancer.php b/src/Plugin/jsonapi/FieldEnhancer/SingleNestedEnhancer.php
similarity index 97%
rename from src/Plugin/resourceFieldEnhancer/SingleNestedEnhancer.php
rename to src/Plugin/jsonapi/FieldEnhancer/SingleNestedEnhancer.php
index 174652f2053f00913b2c19c84da5621d07de0ccc..094f9a5f718520476fbe3b14f3ea76d3c6731b4c 100644
--- a/src/Plugin/resourceFieldEnhancer/SingleNestedEnhancer.php
+++ b/src/Plugin/jsonapi/FieldEnhancer/SingleNestedEnhancer.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Drupal\jsonapi_extras\Plugin\resourceFieldEnhancer;
+namespace Drupal\jsonapi_extras\Plugin\jsonapi\FieldEnhancer;
 
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Plugin\PluginBase;