diff --git a/src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/WebOptimizedImageDeliveryService.java b/src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/WebOptimizedImageDeliveryService.java
index b510a018..049c58c3 100644
--- a/src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/WebOptimizedImageDeliveryService.java
+++ b/src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/WebOptimizedImageDeliveryService.java
@@ -25,8 +25,8 @@
 import com.day.cq.dam.api.Asset;
 
 /**
- * Supports rendering asset renditions from stored in AEMaaCS sites instance via Next Generation Dynamic Media
- * "Web-Optimized Image Delivery", rendering the renditions on the edge.
+ * Supports rendering asset renditions from stored in AEMaaCS sites instance via "Web-Optimized Image Delivery",
+ * rendering the renditions on the edge.
  * This is not available in AEM 6.5 or AEMaaCS SDK.
  */
 public interface WebOptimizedImageDeliveryService {
diff --git a/src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/WebOptimizedImageDeliveryServiceImpl.java b/src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/WebOptimizedImageDeliveryServiceImpl.java
index 9889a2db..42b3a604 100644
--- a/src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/WebOptimizedImageDeliveryServiceImpl.java
+++ b/src/main/java/io/wcm/handler/mediasource/dam/impl/weboptimized/WebOptimizedImageDeliveryServiceImpl.java
@@ -47,7 +47,7 @@ public class WebOptimizedImageDeliveryServiceImpl implements WebOptimizedImageDe
 
   @ObjectClassDefinition(
       name = "wcm.io Media Handler Web-Optimized Image Delivery Support",
-      description = "Support for Next Generation Dynamic Media Web-Optimized Image Delivery capabilites.")
+      description = "Support for AEMaaCS Web-Optimized Image Delivery capabilites.")
   @interface Config {
 
     @AttributeDefinition(
diff --git a/src/main/java/io/wcm/handler/mediasource/ngdm/NextGenDynamicMediaConfigModel.java b/src/main/java/io/wcm/handler/mediasource/ngdm/NextGenDynamicMediaConfigModel.java
index 7e2eda2c..24a68b08 100644
--- a/src/main/java/io/wcm/handler/mediasource/ngdm/NextGenDynamicMediaConfigModel.java
+++ b/src/main/java/io/wcm/handler/mediasource/ngdm/NextGenDynamicMediaConfigModel.java
@@ -39,7 +39,7 @@
 import io.wcm.handler.mediasource.ngdm.impl.NextGenDynamicMediaConfigService;
 
 /**
- * Prepares Next Generation Dynamic Media Remote Assets configuration for GraniteUI components (fileupload, pathfield).
+ * Prepares Dynamic Media with OpenAPI Remote Assets configuration for GraniteUI components (fileupload, pathfield).
  */
 @Model(adaptables = SlingHttpServletRequest.class)
 @ProviderType
@@ -71,13 +71,13 @@ private static String buildConfigJsonString(@NotNull NextGenDynamicMediaConfigSe
       return MAPPER.writeValueAsString(map);
     }
     catch (JsonProcessingException ex) {
-      log.warn("Unable to serialize Next Generation Dynamic Media config to JSON.", ex);
+      log.warn("Unable to serialize Dynamic Media with OpenAPI config to JSON.", ex);
       return "{}";
     }
   }
 
   /**
-   * @return true if Next Generation Dynamic Media is available and enabled.
+   * @return true if Dynamic Media with OpenAPI for remote assets is available and enabled.
    */
   public boolean isEnabled() {
     return this.enabled;
diff --git a/src/main/java/io/wcm/handler/mediasource/ngdm/NextGenDynamicMediaMediaSource.java b/src/main/java/io/wcm/handler/mediasource/ngdm/NextGenDynamicMediaMediaSource.java
index c7badf5b..99a733ea 100644
--- a/src/main/java/io/wcm/handler/mediasource/ngdm/NextGenDynamicMediaMediaSource.java
+++ b/src/main/java/io/wcm/handler/mediasource/ngdm/NextGenDynamicMediaMediaSource.java
@@ -60,7 +60,7 @@
 import io.wcm.sling.models.annotations.AemObject;
 
 /**
- * Handles remote asset referenced via Next Generation Dynamic Media.
+ * Handles remote asset referenced via Dynamic Media with OpenAPI.
  */
 @Model(adaptables = {
     SlingHttpServletRequest.class, Resource.class
diff --git a/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaConfigService.java b/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaConfigService.java
index a0953bab..00c272cf 100644
--- a/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaConfigService.java
+++ b/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaConfigService.java
@@ -48,7 +48,7 @@ public interface NextGenDynamicMediaConfigService {
   boolean isEnabledRemoteAssets();
 
   /**
-   * Enable Next Generation Dynamic Media for local assets in this AEMaaCS instance.
+   * Enable Dynamic Media with OpenAPI for local assets in this AEMaaCS instance.
    * @return true if enabled for local assets.
    */
   boolean isEnabledLocalAssets();
@@ -119,7 +119,7 @@ public interface NextGenDynamicMediaConfigService {
   String getAssetMetadataPath();
 
   /**
-   * Gets the Next Generation Dynamic Media tenant (also known technically as the repository ID) for remote assets.
+   * Gets the Dynamic Media with OpenAPI tenant (also known technically as the repository ID) for remote assets.
    * @return the repository ID
    */
   @Nullable
diff --git a/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaConfigServiceImpl.java b/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaConfigServiceImpl.java
index 00cffb09..be47472f 100644
--- a/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaConfigServiceImpl.java
+++ b/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaConfigServiceImpl.java
@@ -44,7 +44,7 @@ public class NextGenDynamicMediaConfigServiceImpl implements NextGenDynamicMedia
 
   @ObjectClassDefinition(
       name = "wcm.io Media Handler Dynamic Media with OpenAPI Support",
-      description = "Support for Next Generation Dynamic Media.")
+      description = "Support for Dynamic Media with OpenAPI.")
   @interface Config {
 
     @AttributeDefinition(
diff --git a/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaReference.java b/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaReference.java
index 417310b3..13eec568 100644
--- a/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaReference.java
+++ b/src/main/java/io/wcm/handler/mediasource/ngdm/impl/NextGenDynamicMediaReference.java
@@ -33,7 +33,7 @@
 import com.day.cq.dam.api.Asset;
 
 /**
- * Parses and validates Next Generation Dynamic Media references.
+ * Parses and validates Dynamic Media with OpenAPI asset references.
  * <p>
  * Example: <code>/urn:aaid:aem:12345678-abcd-abcd-abcd-abcd12345678/my-image.jpg</code>
  * </p>
diff --git a/src/main/java/io/wcm/handler/mediasource/ngdm/package-info.java b/src/main/java/io/wcm/handler/mediasource/ngdm/package-info.java
index 7e14a8b2..46b2df12 100644
--- a/src/main/java/io/wcm/handler/mediasource/ngdm/package-info.java
+++ b/src/main/java/io/wcm/handler/mediasource/ngdm/package-info.java
@@ -18,7 +18,7 @@
  * #L%
  */
 /**
- * Media source implementation for Next Generation Dynamic Media.
+ * Media source implementation for Dynamic Media with OpenAPI.
  */
 @org.osgi.annotation.versioning.Version("1.1.0")
 package io.wcm.handler.mediasource.ngdm;