diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/crypto/EnhancedKeyStoreLoader.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/crypto/EnhancedKeyStoreLoader.java
index 952ee25e01b1..8e891f5dd6ce 100644
--- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/crypto/EnhancedKeyStoreLoader.java
+++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/crypto/EnhancedKeyStoreLoader.java
@@ -310,8 +310,8 @@ public EnhancedKeyStoreLoader scan() throws KeyLoadingException, KeyStoreExcepti
     }
 
     /**
-     * Iterates over the local nodes and creates the agreement key and certificate for each.  This
-     * method should be called after {@link #scan()} and before {@link #verify()}.
+     * Iterates over the local nodes and creates the agreement key and certificate for each.  This method should be
+     * called after {@link #scan()} and before {@link #verify()}.
      *
      * @return this {@link EnhancedKeyStoreLoader} instance.
      * @throws NoSuchAlgorithmException if the algorithm required to generate the key pair is not available.
@@ -1476,7 +1476,7 @@ private void cleanupByMovingPfxFilesToSubDirectory() throws KeyStoreException, K
         if (sPublicPfx.exists()
                 && sPublicPfx.isFile()
                 && !sPublicPfx.renameTo(
-                        pfxArchiveDirectory.resolve(sPublicPfx.getName()).toFile())) {
+                        pfxDateDirectory.resolve(sPublicPfx.getName()).toFile())) {
             cleanupErrorCount.incrementAndGet();
         }
         if (cleanupErrorCount.get() > 0) {