diff --git a/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriter.java b/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriter.java
index 67e5746b3ac..f52f9965f00 100644
--- a/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriter.java
+++ b/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriter.java
@@ -80,7 +80,8 @@
  *
  * @param <T> The concrete type, used to provide a fluent interface.
  * @param <U> The import container used by the writer to manage imports.
- * @deprecated prefer {@link SymbolWriter}. This will be removed in a future release.
+ * @deprecated prefer {@link software.amazon.smithy.codegen.core.SymbolWriter}.
+ * This will be removed in a future release.
  */
 @SmithyUnstableApi
 @Deprecated
diff --git a/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriterDelegator.java b/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriterDelegator.java
index b4f9d65b989..1a7afcf6da3 100644
--- a/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriterDelegator.java
+++ b/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriterDelegator.java
@@ -32,8 +32,6 @@
 import software.amazon.smithy.utils.SmithyUnstableApi;
 
 /**
- * This class is deprecated and will be removed in a future release.
- *
  * <p>Creates and manages {@link CodegenWriter}s for files and namespaces based
  * on {@link Symbol}s created for a {@link Shape}.
  *
@@ -65,6 +63,8 @@
  * with since generic types aren't needed in concrete implementations.
  *
  * @param <T> The type of {@link CodegenWriter} to create and manage.
+ * @deprecated prefer {@link software.amazon.smithy.codegen.core.WriterDelegator}.
+ * This class will be removed in a future release.
  */
 @SmithyUnstableApi
 @Deprecated
diff --git a/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriterFactory.java b/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriterFactory.java
index 077548ee4a9..215b6891e99 100644
--- a/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriterFactory.java
+++ b/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/writer/CodegenWriterFactory.java
@@ -19,8 +19,6 @@
 import software.amazon.smithy.utils.SmithyUnstableApi;
 
 /**
- * This class is deprecated and will be removed in a future release.
- *
  * <p>Factory used to create a {@code CodegenWriter}.
  *
  * <p>The following example shows how to implement a basic
@@ -43,6 +41,8 @@
  * }</pre>
  *
  * @param <T> Type of {@code CodegenWriter} to create.
+ * @deprecated prefer {@link software.amazon.smithy.codegen.core.SymbolWriter.Factory}.
+ * This will be removed in a future release.
  */
 @FunctionalInterface
 @SmithyUnstableApi