diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index 36acfebd..7da2ff4b 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -93,8 +93,8 @@ jobs:
         run: mvn clean --batch-mode clean generate-sources
       - name: Tests and enforcer (fips)
         run: |
-          # install the sdk-fips-bouncycastle jar so that FIPS mode tests work
-          mvn --batch-mode install -pl sdk-fips-bouncycastle -am \
+          # install the sdk-fips-bc jar so that FIPS mode tests work
+          mvn --batch-mode install -pl sdk-fips-bc -am \
             -Dmaven.antrun.skip \
             -Dmaven.test.skip
           mvn --batch-mode test enforcer:enforce -P 'fips,!non-fips' \
diff --git a/cmdline/pom.xml b/cmdline/pom.xml
index 28a20b80..0047db9e 100644
--- a/cmdline/pom.xml
+++ b/cmdline/pom.xml
@@ -88,8 +88,9 @@
             <dependencies>
                 <dependency>
                     <groupId>io.opentdf.platform</groupId>
-                    <artifactId>sdk-fips-bouncycastle</artifactId>
+                    <artifactId>sdk-fips-bc</artifactId>
                     <version>${project.version}</version>
+                    <scope>runtime</scope>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/pom.xml b/pom.xml
index c15307a7..21e750c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,6 +218,67 @@
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>3.1.2</version>
                 </plugin>
+                <!-- Plugin to create source JAR -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.3.1</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <!-- Plugin to create Javadoc JAR -->
+                <plugin>
+                    <groupId>org.jetbrains.dokka</groupId>
+                    <artifactId>dokka-maven-plugin</artifactId>
+                    <version>2.0.0</version>
+                    <executions>
+                        <execution>
+                            <id>javadoc</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>javadocJar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <!-- Plugin to generate checksum files -->
+                <plugin>
+                    <groupId>net.nicoulaj.maven.plugins</groupId>
+                    <artifactId>checksum-maven-plugin</artifactId>
+                    <version>1.11</version>
+                    <executions>
+                        <execution>
+                            <id>create-checksums</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>files</goal>
+                            </goals>
+                            <configuration>
+                                <algorithms>
+                                    <algorithm>MD5</algorithm>
+                                    <algorithm>SHA-1</algorithm>
+                                    <algorithm>SHA-256</algorithm>
+                                    <algorithm>SHA-512</algorithm>
+                                </algorithms>
+                                <failOnError>true</failOnError>
+                                <fileSets>
+                                    <fileSet>
+                                        <directory>${project.build.directory}</directory>
+                                        <includes>
+                                            <include>*.jar</include>
+                                        </includes>
+                                    </fileSet>
+                                </fileSets>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -287,28 +348,15 @@
             <id>develop</id>
             <modules>
                 <module>sdk</module>
-                <module>sdk-fips-bouncycastle</module>
                 <module>cmdline</module>
+                <module>sdk-pqc-bc</module>
+                <module>sdk-fips-bc</module>
                 <module>examples</module>
             </modules>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
-        <profile>
-            <!-- sdk-pqc-bc is gated behind the non-fips profile because its
-                 BC compile dependency (bcprov-jdk18on) collides with bc-fips
-                 on the same package namespace. A FIPS build (mvn -P fips,!non-fips)
-                 must omit sdk-pqc-bc from the reactor entirely; consumers who
-                 want hybrid PQC opt in via the non-fips profile. -->
-            <id>non-fips</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>sdk-pqc-bc</module>
-            </modules>
-        </profile>
         <profile>
             <id>stage</id>
             <modules>
@@ -345,7 +393,8 @@
             <id>release</id>
             <modules>
                 <module>sdk</module>
-                <module>sdk-fips-bouncycastle</module>
+                <module>sdk-pqc-bc</module>
+                <module>sdk-fips-bc</module>
             </modules>
             <activation>
                 <activeByDefault>false</activeByDefault>
diff --git a/sdk-fips-bouncycastle/pom.xml b/sdk-fips-bc/pom.xml
similarity index 67%
rename from sdk-fips-bouncycastle/pom.xml
rename to sdk-fips-bc/pom.xml
index 6c1f08b8..f379bf73 100644
--- a/sdk-fips-bouncycastle/pom.xml
+++ b/sdk-fips-bc/pom.xml
@@ -6,8 +6,8 @@
         <artifactId>sdk-pom</artifactId>
         <version>0.17.0</version>
     </parent>
-    <artifactId>sdk-fips-bouncycastle</artifactId>
-    <name>io.opentdf.platform:sdk-fips-bouncycastle</name>
+    <artifactId>sdk-fips-bc</artifactId>
+    <name>io.opentdf.platform:sdk-fips-bc</name>
     <description>BouncyCastle FIPS-backed HkdfProvider SPI implementation (FIPS 140-approved HKDF via bc-fips).</description>
     <packaging>jar</packaging>
     <properties>
@@ -38,4 +38,23 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <!-- Plugin to create source JAR -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <!-- Plugin to create Javadoc JAR -->
+            <plugin>
+                <groupId>org.jetbrains.dokka</groupId>
+                <artifactId>dokka-maven-plugin</artifactId>
+            </plugin>
+            <!-- Plugin to generate checksum files -->
+            <plugin>
+                <groupId>net.nicoulaj.maven.plugins</groupId>
+                <artifactId>checksum-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdk-fips-bouncycastle/src/main/java/io/opentdf/platform/sdk/fips/bouncycastle/BouncyCastleFipsHkdfProvider.java b/sdk-fips-bc/src/main/java/io/opentdf/platform/sdk/fips/bouncycastle/BouncyCastleFipsHkdfProvider.java
similarity index 100%
rename from sdk-fips-bouncycastle/src/main/java/io/opentdf/platform/sdk/fips/bouncycastle/BouncyCastleFipsHkdfProvider.java
rename to sdk-fips-bc/src/main/java/io/opentdf/platform/sdk/fips/bouncycastle/BouncyCastleFipsHkdfProvider.java
diff --git a/sdk-fips-bouncycastle/src/main/resources/META-INF/services/io.opentdf.platform.sdk.HkdfProvider b/sdk-fips-bc/src/main/resources/META-INF/services/io.opentdf.platform.sdk.HkdfProvider
similarity index 100%
rename from sdk-fips-bouncycastle/src/main/resources/META-INF/services/io.opentdf.platform.sdk.HkdfProvider
rename to sdk-fips-bc/src/main/resources/META-INF/services/io.opentdf.platform.sdk.HkdfProvider
diff --git a/sdk-fips-bouncycastle/src/test/java/io/opentdf/platform/sdk/fips/bouncycastle/BouncyCastleFipsHkdfProviderTest.java b/sdk-fips-bc/src/test/java/io/opentdf/platform/sdk/fips/bouncycastle/BouncyCastleFipsHkdfProviderTest.java
similarity index 100%
rename from sdk-fips-bouncycastle/src/test/java/io/opentdf/platform/sdk/fips/bouncycastle/BouncyCastleFipsHkdfProviderTest.java
rename to sdk-fips-bc/src/test/java/io/opentdf/platform/sdk/fips/bouncycastle/BouncyCastleFipsHkdfProviderTest.java
diff --git a/sdk-pqc-bc/pom.xml b/sdk-pqc-bc/pom.xml
index cfbb4130..c647bc55 100644
--- a/sdk-pqc-bc/pom.xml
+++ b/sdk-pqc-bc/pom.xml
@@ -79,4 +79,23 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <!-- Plugin to create source JAR -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <!-- Plugin to create Javadoc JAR -->
+            <plugin>
+                <groupId>org.jetbrains.dokka</groupId>
+                <artifactId>dokka-maven-plugin</artifactId>
+            </plugin>
+            <!-- Plugin to generate checksum files -->
+            <plugin>
+                <groupId>net.nicoulaj.maven.plugins</groupId>
+                <artifactId>checksum-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 1ef48063..f8c536a7 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -286,15 +286,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <!-- Test-jar for shared test fixtures (FakeServicesBuilder, etc.)
                  consumed by sibling modules like sdk-pqc-bc. -->
@@ -314,48 +305,11 @@
             <plugin>
                 <groupId>org.jetbrains.dokka</groupId>
                 <artifactId>dokka-maven-plugin</artifactId>
-                <version>2.0.0</version>
-                <executions>
-                    <execution>
-                        <id>javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>javadocJar</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <!-- Plugin to generate checksum files -->
             <plugin>
                 <groupId>net.nicoulaj.maven.plugins</groupId>
                 <artifactId>checksum-maven-plugin</artifactId>
-                <version>1.11</version>
-                <executions>
-                    <execution>
-                        <id>create-checksums</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>files</goal>
-                        </goals>
-                        <configuration>
-                            <algorithms>
-                                <algorithm>MD5</algorithm>
-                                <algorithm>SHA-1</algorithm>
-                                <algorithm>SHA-256</algorithm>
-                                <algorithm>SHA-512</algorithm>
-                            </algorithms>
-                            <failOnError>true</failOnError>
-                            <fileSets>
-                                <fileSet>
-                                    <directory>${project.build.directory}</directory>
-                                    <includes>
-                                        <include>*.jar</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -525,7 +479,7 @@
                             <additionalClasspathDependencies>
                                 <dependency>
                                     <groupId>io.opentdf.platform</groupId>
-                                    <artifactId>sdk-fips-bouncycastle</artifactId>
+                                    <artifactId>sdk-fips-bc</artifactId>
                                     <version>${project.version}</version>
                                 </dependency>
                             </additionalClasspathDependencies>
diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/ECKeyPair.java b/sdk/src/main/java/io/opentdf/platform/sdk/ECKeyPair.java
index ef906d06..bdf5674f 100644
--- a/sdk/src/main/java/io/opentdf/platform/sdk/ECKeyPair.java
+++ b/sdk/src/main/java/io/opentdf/platform/sdk/ECKeyPair.java
@@ -112,7 +112,7 @@ public static byte[] computeECDHKey(ECPublicKey publicKey, ECPrivateKey privateK
      * that is 32 bytes (256 bits) long.
      *
      * Delegates to a registered {@link HkdfProvider} when one is available on the
-     * classpath (e.g. {@code sdk-fips-bouncycastle}); otherwise falls back to the
+     * classpath (e.g. {@code sdk-fips-bc}); otherwise falls back to the
      * JDK-native HmacSHA256 implementation.
      */
     public static byte[] calculateHKDF(byte[] salt, byte[] secret) {
@@ -141,7 +141,7 @@ public static byte[] calculateHKDF(byte[] salt, byte[] secret) {
         } catch (Exception e) {
             String className = e.getClass().getName();
             if (className.contains("bouncycastle") && className.endsWith("IllegalKeyException")) {
-                throw new SDKException("if running bouncycastle FIPS in approved_only mode include the sdk-fips-bouncycastle jar to use HKDF", e);
+                throw new SDKException("if running bouncycastle FIPS in approved_only mode include the sdk-fips-bc jar to use HKDF", e);
             }
             throw new SDKException("error computing HKDF", e);
         }
diff --git a/sdk/src/main/java/io/opentdf/platform/sdk/HkdfProvider.java b/sdk/src/main/java/io/opentdf/platform/sdk/HkdfProvider.java
index 57581619..bee23dae 100644
--- a/sdk/src/main/java/io/opentdf/platform/sdk/HkdfProvider.java
+++ b/sdk/src/main/java/io/opentdf/platform/sdk/HkdfProvider.java
@@ -6,7 +6,7 @@
  * When no implementation is on the classpath, {@link ECKeyPair#calculateHKDF} falls
  * back to the JDK-native HmacSHA256 implementation.
  *
- * The FIPS-approved implementation is {@code io.opentdf.platform:sdk-fips-bouncycastle},
+ * The FIPS-approved implementation is {@code io.opentdf.platform:sdk-fips-bc},
  * which uses the BouncyCastle FIPS KDF API directly.
  */
 public interface HkdfProvider {
diff --git a/sdk/src/test/java/io/opentdf/platform/sdk/ECKeyPairTest.java b/sdk/src/test/java/io/opentdf/platform/sdk/ECKeyPairTest.java
index 537e2f8f..13d83bd2 100644
--- a/sdk/src/test/java/io/opentdf/platform/sdk/ECKeyPairTest.java
+++ b/sdk/src/test/java/io/opentdf/platform/sdk/ECKeyPairTest.java
@@ -183,6 +183,6 @@ void testECDSA() {
     @EnabledIfSystemProperty(named = "org.bouncycastle.fips.approved_only", matches = "true")
     void testInformativeException() {
         var thrown = assertThrows(SDKException.class, () -> ECKeyPair.calculateHKDF(new byte[]{0}, new byte[]{1,2,3}));
-        assertThat(thrown).hasMessage("if running bouncycastle FIPS in approved_only mode include the sdk-fips-bouncycastle jar to use HKDF");
+        assertThat(thrown).hasMessage("if running bouncycastle FIPS in approved_only mode include the sdk-fips-bc jar to use HKDF");
     }
 }
diff --git a/sdk/src/test/java/io/opentdf/platform/sdk/FipsProviderVerificationTest.java b/sdk/src/test/java/io/opentdf/platform/sdk/FipsProviderVerificationTest.java
index c86a6082..13aa76d4 100644
--- a/sdk/src/test/java/io/opentdf/platform/sdk/FipsProviderVerificationTest.java
+++ b/sdk/src/test/java/io/opentdf/platform/sdk/FipsProviderVerificationTest.java
@@ -52,7 +52,7 @@ void keyManagerFactoryAlgorithmIsPkix() {
     @Test
     void providerResolves() {
         assertThat(HkdfResolver.get())
-                .as("the sdk-fips-bouncycastle library must be on the path so that the Hkdf provider resolves. this is configured in the surefire plugin and the sdk-fips-bouncycastle project must be packaged")
+                .as("the sdk-fips-bc library must be on the path so that the Hkdf provider resolves. this is configured in the surefire plugin and the sdk-fips-bc project must be packaged")
                 .isNotNull();
     }
 }