diff --git a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultBindingNamingEnumeration.java b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultBindingNamingEnumeration.java
index 6321a86a56..6324cbb43a 100644
--- a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultBindingNamingEnumeration.java
+++ b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultBindingNamingEnumeration.java
@@ -38,7 +38,9 @@
  * The default Binding NamingEnumeration.
  *
  * @author Manfred Riem (mriem@manorrock.com)
+ * @deprecated
  */
+@Deprecated(since = "23.5.0", forRemoval = true)
 public class DefaultBindingNamingEnumeration implements NamingEnumeration<Binding> {
 
     /**
diff --git a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultInitialContext.java b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultInitialContext.java
index 2c65929508..b53e2ce84e 100644
--- a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultInitialContext.java
+++ b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultInitialContext.java
@@ -49,7 +49,9 @@
  * The default InitialContext.
  *
  * @author Manfred Riem (mriem@manorrock.com)
+ * @deprecated
  */
+@Deprecated(since = "23.5.0", forRemoval = true)
 public class DefaultInitialContext implements Context {
 
     /**
diff --git a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultInitialContextFactory.java b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultInitialContextFactory.java
index 01c290a20d..1a83cf4286 100644
--- a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultInitialContextFactory.java
+++ b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultInitialContextFactory.java
@@ -36,7 +36,9 @@
  * The default InitialContextFactory.
  *
  * @author Manfred Riem (mriem@manorrock.com)
+ * @deprecated
  */
+@Deprecated(since = "23.5.0", forRemoval = true)
 public class DefaultInitialContextFactory implements InitialContextFactory {
 
     /**
diff --git a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultNameParser.java b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultNameParser.java
index cee36933ab..8573bc367f 100644
--- a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultNameParser.java
+++ b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultNameParser.java
@@ -36,7 +36,9 @@
  * The default NameParser.
  *
  * @author Manfred Riem (mriem@manorrock.com)
+ * @deprecated
  */
+@Deprecated(since = "23.5.0", forRemoval = true)
 public class DefaultNameParser implements NameParser {
 
     /**
diff --git a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultNamingEnumeration.java b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultNamingEnumeration.java
index 11ed050e79..5eb49fa07e 100644
--- a/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultNamingEnumeration.java
+++ b/naming/impl/src/main/java/cloud/piranha/naming/impl/DefaultNamingEnumeration.java
@@ -38,7 +38,9 @@
  * The default NamingEnumeration.
  *
  * @author Manfred Riem (mriem@manorrock.com)
+ * @deprecated
  */
+@Deprecated(since = "23.5.0", forRemoval = true)
 public class DefaultNamingEnumeration implements NamingEnumeration<NameClassPair> {
 
     /**
diff --git a/naming/impl/src/main/java/module-info.java b/naming/impl/src/main/java/module-info.java
index df2c797202..7094900100 100644
--- a/naming/impl/src/main/java/module-info.java
+++ b/naming/impl/src/main/java/module-info.java
@@ -30,7 +30,9 @@
  * This module delivers the default JNDI integration for Piranha.
  * 
  * @author Manfred Riem (mriem@manorrock.com)
+ * @deprecated
  */
+@Deprecated(since = "23.5.0", forRemoval = true)
 module cloud.piranha.naming.impl {
     
     exports cloud.piranha.naming.impl;
diff --git a/naming/thread/src/main/java/cloud/piranha/naming/thread/ThreadInitialContextFactory.java b/naming/thread/src/main/java/cloud/piranha/naming/thread/ThreadInitialContextFactory.java
index bd143e9276..2fde4e5ad6 100644
--- a/naming/thread/src/main/java/cloud/piranha/naming/thread/ThreadInitialContextFactory.java
+++ b/naming/thread/src/main/java/cloud/piranha/naming/thread/ThreadInitialContextFactory.java
@@ -37,7 +37,9 @@
  * The Thread InitialContextFactory.
  *
  * @author Manfred Riem (mriem@manorrock.com)
+ * @deprecated
  */
+@Deprecated(since = "23.5.0", forRemoval = true)
 public class ThreadInitialContextFactory implements InitialContextFactory {
 
     /**
diff --git a/naming/thread/src/main/java/module-info.java b/naming/thread/src/main/java/module-info.java
index 50e756c009..8beab751a9 100644
--- a/naming/thread/src/main/java/module-info.java
+++ b/naming/thread/src/main/java/module-info.java
@@ -30,7 +30,9 @@
  * This module delivers the Thread-based JNDI integration for Piranha.
  * 
  * @author Manfred Riem (mriem@manorrock.com)
+ * @deprecated
  */
+@Deprecated(since = "23.5.0", forRemoval = true)
 module cloud.piranha.naming.thread {
     
     exports cloud.piranha.naming.thread;