diff --git a/src/main/java/com/uid2/admin/Main.java b/src/main/java/com/uid2/admin/Main.java
index f2562b29..07c5aece 100644
--- a/src/main/java/com/uid2/admin/Main.java
+++ b/src/main/java/com/uid2/admin/Main.java
@@ -5,8 +5,8 @@
 import com.uid2.admin.auth.OktaAuthProvider;
 import com.uid2.admin.auth.AuthProvider;
 import com.uid2.admin.auth.TokenRefreshHandler;
-import com.uid2.admin.cloudEncryption.CloudKeyRotationStrategy;
-import com.uid2.admin.cloudEncryption.ExpiredKeyCountRetentionStrategy;
+import com.uid2.admin.cloudencryption.CloudKeyRotationStrategy;
+import com.uid2.admin.cloudencryption.ExpiredKeyCountRetentionStrategy;
 import com.uid2.admin.job.JobDispatcher;
 import com.uid2.admin.job.jobsync.EncryptedFilesSyncJob;
 import com.uid2.admin.job.jobsync.PrivateSiteDataSyncJob;
@@ -14,9 +14,9 @@
 import com.uid2.admin.legacy.LegacyClientKeyStoreWriter;
 import com.uid2.admin.legacy.RotatingLegacyClientKeyProvider;
 import com.uid2.admin.managers.KeysetManager;
-import com.uid2.admin.cloudEncryption.CloudSecretGenerator;
+import com.uid2.admin.cloudencryption.CloudSecretGenerator;
 import com.uid2.admin.monitoring.DataStoreMetrics;
-import com.uid2.admin.cloudEncryption.CloudEncryptionKeyManager;
+import com.uid2.admin.cloudencryption.CloudEncryptionKeyManager;
 import com.uid2.admin.secret.*;
 import com.uid2.admin.store.*;
 import com.uid2.admin.store.reader.RotatingAdminKeysetStore;
diff --git a/src/main/java/com/uid2/admin/cloudEncryption/CloudEncryptionKeyManager.java b/src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java
similarity index 99%
rename from src/main/java/com/uid2/admin/cloudEncryption/CloudEncryptionKeyManager.java
rename to src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java
index f23e037f..d2b6a90b 100644
--- a/src/main/java/com/uid2/admin/cloudEncryption/CloudEncryptionKeyManager.java
+++ b/src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.admin.store.writer.CloudEncryptionKeyStoreWriter;
 import com.uid2.shared.auth.OperatorKey;
diff --git a/src/main/java/com/uid2/admin/cloudEncryption/CloudKeyRetentionStrategy.java b/src/main/java/com/uid2/admin/cloudencryption/CloudKeyRetentionStrategy.java
similarity index 83%
rename from src/main/java/com/uid2/admin/cloudEncryption/CloudKeyRetentionStrategy.java
rename to src/main/java/com/uid2/admin/cloudencryption/CloudKeyRetentionStrategy.java
index fc7926e3..67f2d90d 100644
--- a/src/main/java/com/uid2/admin/cloudEncryption/CloudKeyRetentionStrategy.java
+++ b/src/main/java/com/uid2/admin/cloudencryption/CloudKeyRetentionStrategy.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.shared.model.CloudEncryptionKey;
 
diff --git a/src/main/java/com/uid2/admin/cloudEncryption/CloudKeyRotationStrategy.java b/src/main/java/com/uid2/admin/cloudencryption/CloudKeyRotationStrategy.java
similarity index 98%
rename from src/main/java/com/uid2/admin/cloudEncryption/CloudKeyRotationStrategy.java
rename to src/main/java/com/uid2/admin/cloudencryption/CloudKeyRotationStrategy.java
index 1cdb3a38..34c280a9 100644
--- a/src/main/java/com/uid2/admin/cloudEncryption/CloudKeyRotationStrategy.java
+++ b/src/main/java/com/uid2/admin/cloudencryption/CloudKeyRotationStrategy.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.google.common.collect.Streams;
 import com.uid2.admin.store.Clock;
diff --git a/src/main/java/com/uid2/admin/cloudEncryption/CloudSecretGenerator.java b/src/main/java/com/uid2/admin/cloudencryption/CloudSecretGenerator.java
similarity index 92%
rename from src/main/java/com/uid2/admin/cloudEncryption/CloudSecretGenerator.java
rename to src/main/java/com/uid2/admin/cloudencryption/CloudSecretGenerator.java
index 5dc7eaa5..acb42f4c 100644
--- a/src/main/java/com/uid2/admin/cloudEncryption/CloudSecretGenerator.java
+++ b/src/main/java/com/uid2/admin/cloudencryption/CloudSecretGenerator.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.shared.secret.SecureKeyGenerator;
 
diff --git a/src/main/java/com/uid2/admin/cloudEncryption/ExpiredKeyCountRetentionStrategy.java b/src/main/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategy.java
similarity index 96%
rename from src/main/java/com/uid2/admin/cloudEncryption/ExpiredKeyCountRetentionStrategy.java
rename to src/main/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategy.java
index 54a9c724..809d059b 100644
--- a/src/main/java/com/uid2/admin/cloudEncryption/ExpiredKeyCountRetentionStrategy.java
+++ b/src/main/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategy.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.admin.store.Clock;
 import com.uid2.shared.model.CloudEncryptionKey;
diff --git a/src/main/java/com/uid2/admin/vertx/service/CloudEncryptionKeyService.java b/src/main/java/com/uid2/admin/vertx/service/CloudEncryptionKeyService.java
index a18efd2b..b426bec9 100644
--- a/src/main/java/com/uid2/admin/vertx/service/CloudEncryptionKeyService.java
+++ b/src/main/java/com/uid2/admin/vertx/service/CloudEncryptionKeyService.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.uid2.admin.auth.AdminAuthMiddleware;
-import com.uid2.admin.cloudEncryption.CloudKeyRotationStrategy;
+import com.uid2.admin.cloudencryption.CloudKeyRotationStrategy;
 import com.uid2.admin.model.CloudEncryptionKeyListResponse;
 import com.uid2.admin.model.CloudEncryptionKeySummary;
 import com.uid2.admin.store.writer.CloudEncryptionKeyStoreWriter;
diff --git a/src/main/java/com/uid2/admin/vertx/service/OperatorKeyService.java b/src/main/java/com/uid2/admin/vertx/service/OperatorKeyService.java
index 8a360de1..0c42827d 100644
--- a/src/main/java/com/uid2/admin/vertx/service/OperatorKeyService.java
+++ b/src/main/java/com/uid2/admin/vertx/service/OperatorKeyService.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.uid2.admin.auth.AdminAuthMiddleware;
 import com.uid2.admin.auth.RevealedKey;
-import com.uid2.admin.cloudEncryption.CloudEncryptionKeyManager;
+import com.uid2.admin.cloudencryption.CloudEncryptionKeyManager;
 import com.uid2.shared.model.Site;
 import com.uid2.shared.secret.IKeyGenerator;
 import com.uid2.admin.store.writer.OperatorKeyStoreWriter;
diff --git a/src/test/java/com/uid2/admin/cloudEncryption/CloudEncryptionKeyManagerTest.java b/src/test/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManagerTest.java
similarity index 99%
rename from src/test/java/com/uid2/admin/cloudEncryption/CloudEncryptionKeyManagerTest.java
rename to src/test/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManagerTest.java
index 4a84fed3..0ee89907 100644
--- a/src/test/java/com/uid2/admin/cloudEncryption/CloudEncryptionKeyManagerTest.java
+++ b/src/test/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManagerTest.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.admin.store.writer.CloudEncryptionKeyStoreWriter;
 import com.uid2.shared.auth.OperatorKey;
diff --git a/src/test/java/com/uid2/admin/cloudEncryption/ExpiredKeyCountRetentionStrategyTest.java b/src/test/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategyTest.java
similarity index 98%
rename from src/test/java/com/uid2/admin/cloudEncryption/ExpiredKeyCountRetentionStrategyTest.java
rename to src/test/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategyTest.java
index 33a6fcab..85be3198 100644
--- a/src/test/java/com/uid2/admin/cloudEncryption/ExpiredKeyCountRetentionStrategyTest.java
+++ b/src/test/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategyTest.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.admin.store.Clock;
 import com.uid2.shared.model.CloudEncryptionKey;
diff --git a/src/test/java/com/uid2/admin/vertx/CloudEncryptionKeyServiceTest.java b/src/test/java/com/uid2/admin/vertx/CloudEncryptionKeyServiceTest.java
index 782cce41..15c07250 100644
--- a/src/test/java/com/uid2/admin/vertx/CloudEncryptionKeyServiceTest.java
+++ b/src/test/java/com/uid2/admin/vertx/CloudEncryptionKeyServiceTest.java
@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.uid2.admin.cloudEncryption.CloudKeyRotationStrategy;
-import com.uid2.admin.cloudEncryption.ExpiredKeyCountRetentionStrategy;
+import com.uid2.admin.cloudencryption.CloudKeyRotationStrategy;
+import com.uid2.admin.cloudencryption.ExpiredKeyCountRetentionStrategy;
 import com.uid2.admin.model.CloudEncryptionKeyListResponse;
 import com.uid2.admin.model.CloudEncryptionKeySummary;
 import com.uid2.admin.vertx.service.CloudEncryptionKeyService;
diff --git a/src/test/java/com/uid2/admin/vertx/OperatorKeyServiceTest.java b/src/test/java/com/uid2/admin/vertx/OperatorKeyServiceTest.java
index e89f73f3..c0ed1512 100644
--- a/src/test/java/com/uid2/admin/vertx/OperatorKeyServiceTest.java
+++ b/src/test/java/com/uid2/admin/vertx/OperatorKeyServiceTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.uid2.admin.auth.RevealedKey;
-import com.uid2.admin.cloudEncryption.CloudEncryptionKeyManager;
+import com.uid2.admin.cloudencryption.CloudEncryptionKeyManager;
 import com.uid2.admin.vertx.service.IService;
 import com.uid2.admin.vertx.service.OperatorKeyService;
 import com.uid2.admin.vertx.test.ServiceTestBase;
diff --git a/src/test/java/com/uid2/admin/vertx/test/ServiceTestBase.java b/src/test/java/com/uid2/admin/vertx/test/ServiceTestBase.java
index 7bbb315c..debaa987 100644
--- a/src/test/java/com/uid2/admin/vertx/test/ServiceTestBase.java
+++ b/src/test/java/com/uid2/admin/vertx/test/ServiceTestBase.java
@@ -9,7 +9,7 @@
 import com.uid2.admin.legacy.LegacyClientKeyStoreWriter;
 import com.uid2.admin.legacy.RotatingLegacyClientKeyProvider;
 import com.uid2.admin.managers.KeysetManager;
-import com.uid2.admin.cloudEncryption.CloudSecretGenerator;
+import com.uid2.admin.cloudencryption.CloudSecretGenerator;
 import com.uid2.admin.secret.IEncryptionKeyManager;
 import com.uid2.admin.vertx.Endpoints;
 import com.uid2.shared.model.*;