diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java b/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
index f0ec2535b..f6fa9c54b 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
@@ -113,7 +113,7 @@ public class Storage {
         try {
             this.implementation.init();
         } catch (Exception e) {
-            this.plugin.getLogger().severe("Failed to init storage dao");
+            this.plugin.getLogger().severe("Failed to init storage implementation");
             e.printStackTrace();
         }
     }
@@ -122,7 +122,7 @@ public class Storage {
         try {
             this.implementation.shutdown();
         } catch (Exception e) {
-            this.plugin.getLogger().severe("Failed to shutdown storage dao");
+            this.plugin.getLogger().severe("Failed to shutdown storage implementation");
             e.printStackTrace();
         }
     }
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/custom/CustomStorageProviders.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/custom/CustomStorageProviders.java
index 2377c3f04..b16975902 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/custom/CustomStorageProviders.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/custom/CustomStorageProviders.java
@@ -26,7 +26,7 @@
 package me.lucko.luckperms.common.storage.implementation.custom;
 
 /**
- * Hook to allow external code to provide a storage dao
+ * Hook to allow external code to provide a storage implementation
  */
 public final class CustomStorageProviders {
     private CustomStorageProviders() {}
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/CombinedConfigurateStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/CombinedConfigurateStorage.java
index 8875b919f..9fad13f97 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/CombinedConfigurateStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/CombinedConfigurateStorage.java
@@ -145,9 +145,10 @@ public class CombinedConfigurateStorage extends AbstractConfigurateStorage {
     private FileWatcher.WatchedLocation watcher = null;
 
     /**
-     * Creates a new configurate dao
+     * Creates a new configurate storage implementation
+     *
      * @param plugin the plugin instance
-     * @param implementationName the name of this dao
+     * @param implementationName the name of this implementation
      * @param fileExtension the file extension used by this instance, including a "." at the start
      * @param dataFolderName the name of the folder used to store data
      */
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java
index c2bae9f7e..2abe1158a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/SeparatedConfigurateStorage.java
@@ -66,9 +66,10 @@ public class SeparatedConfigurateStorage extends AbstractConfigurateStorage {
     private FileWatcher.WatchedLocation trackWatcher = null;
 
     /**
-     * Creates a new configurate dao
+     * Creates a new configurate storage implementation
+     *
      * @param plugin the plugin instance
-     * @param implementationName the name of this dao
+     * @param implementationName the name of this implementation
      * @param fileExtension the file extension used by this instance, including a "." at the start
      * @param dataFolderName the name of the folder used to store data
      */
diff --git a/common/src/main/java/me/lucko/luckperms/common/tasks/ExpireTemporaryTask.java b/common/src/main/java/me/lucko/luckperms/common/tasks/ExpireTemporaryTask.java
index ee9be4357..25dc358ae 100644
--- a/common/src/main/java/me/lucko/luckperms/common/tasks/ExpireTemporaryTask.java
+++ b/common/src/main/java/me/lucko/luckperms/common/tasks/ExpireTemporaryTask.java
@@ -67,7 +67,7 @@ public class ExpireTemporaryTask implements Runnable {
 
     // return true if the holder's io lock is currently held, false otherwise
     private static boolean shouldSkip(PermissionHolder holder) {
-        // if the holder is currently being manipulated by the storage dao,
+        // if the holder is currently being manipulated by the storage impl,
         // don't attempt to audit temporary permissions
         if (!holder.getIoLock().tryLock()) {
             // if #tryLock returns false, it means it's held by something else