diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java
index 3c7e8cff7..5abbeae64 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageBackupCommand.java
@@ -21,7 +21,7 @@ import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.db.DBType;
 import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.db.SQLiteDB;
-import com.djrapitops.plan.db.access.queries.AggregateQueries;
+import com.djrapitops.plan.db.access.queries.ServerAggregateQueries;
 import com.djrapitops.plan.db.access.transactions.BackupCopyTransaction;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.locale.Locale;
@@ -126,7 +126,7 @@ public class ManageBackupCommand extends CommandNode {
      * @param copyFromDB Database you want to backup.
      */
     private void createNewBackup(String dbName, Database copyFromDB) {
-        Integer userCount = copyFromDB.query(AggregateQueries.baseUserCount());
+        Integer userCount = copyFromDB.query(ServerAggregateQueries.baseUserCount());
         if (userCount <= 0) {
             return;
         }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/data/store/containers/NetworkContainer.java b/Plan/common/src/main/java/com/djrapitops/plan/data/store/containers/NetworkContainer.java
index b78f1845e..01a7aeb78 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/data/store/containers/NetworkContainer.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/data/store/containers/NetworkContainer.java
@@ -23,7 +23,7 @@ import com.djrapitops.plan.data.store.keys.ServerKeys;
 import com.djrapitops.plan.data.store.mutators.PlayersMutator;
 import com.djrapitops.plan.data.store.mutators.TPSMutator;
 import com.djrapitops.plan.data.store.mutators.health.NetworkHealthInformation;
-import com.djrapitops.plan.db.access.queries.AggregateQueries;
+import com.djrapitops.plan.db.access.queries.ServerAggregateQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.server.Server;
 import com.djrapitops.plan.system.info.server.properties.ServerProperties;
@@ -104,7 +104,7 @@ public class NetworkContainer extends DataContainer {
         putSupplier(NetworkKeys.SERVERS_TAB, () -> {
             StringBuilder serverBoxes = new StringBuilder();
             Map<Integer, List<TPS>> playersOnlineData = getValue(NetworkKeys.NETWORK_PLAYER_ONLINE_DATA).orElse(new HashMap<>());
-            Map<UUID, Integer> userCounts = dbSystem.getDatabase().query(AggregateQueries.serverUserCounts());
+            Map<UUID, Integer> userCounts = dbSystem.getDatabase().query(ServerAggregateQueries.serverUserCounts());
             Collection<Server> servers = getValue(NetworkKeys.BUKKIT_SERVERS).orElse(new ArrayList<>());
             servers.stream()
                     .sorted((one, two) -> String.CASE_INSENSITIVE_ORDER.compare(one.getName(), two.getName()))
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/AggregateQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/ServerAggregateQueries.java
similarity index 97%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/AggregateQueries.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/ServerAggregateQueries.java
index 44d7eb054..feab5eacb 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/AggregateQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/ServerAggregateQueries.java
@@ -31,13 +31,13 @@ import java.util.Map;
 import java.util.UUID;
 
 /**
- * Static method class for queries that count how many entries of particular kinds there are.
+ * Static method class for queries that count how many entries of particular kinds there are for a server.
  *
  * @author Rsl1122
  */
-public class AggregateQueries {
+public class ServerAggregateQueries {
 
-    private AggregateQueries() {
+    private ServerAggregateQueries() {
         /* Static method class */
     }
 
@@ -82,7 +82,7 @@ public class AggregateQueries {
      * Count how many users are on each server in the network.
      * <p>
      * Please note that counts can overlap as one user can join multiple servers.
-     * Use {@link AggregateQueries#baseUserCount()} if you want to count total number of users.
+     * Use {@link ServerAggregateQueries#baseUserCount()} if you want to count total number of users.
      *
      * @return Map: Server UUID - Count of users registered to that server
      */
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/ServerContainerQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/ServerContainerQuery.java
index 31eae6348..03437a2b9 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/ServerContainerQuery.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/ServerContainerQuery.java
@@ -23,8 +23,8 @@ import com.djrapitops.plan.data.store.mutators.PlayersMutator;
 import com.djrapitops.plan.data.store.mutators.SessionsMutator;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.Query;
-import com.djrapitops.plan.db.access.queries.AggregateQueries;
 import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.ServerAggregateQueries;
 import com.djrapitops.plan.system.cache.SessionCache;
 import com.djrapitops.plan.system.info.server.Server;
 
@@ -75,8 +75,8 @@ public class ServerContainerQuery implements Query<ServerContainer> {
             return db.query(OptionalFetchQueries.fetchPeakPlayerCount(serverUUID, twoDaysAgo)).orElse(null);
         });
 
-        container.putCachingSupplier(ServerKeys.COMMAND_USAGE, () -> db.query(AggregateQueries.commandUsageCounts(serverUUID)));
-        container.putCachingSupplier(ServerKeys.WORLD_TIMES, () -> db.query(AggregateQueries.totalWorldTimes(serverUUID)));
+        container.putCachingSupplier(ServerKeys.COMMAND_USAGE, () -> db.query(ServerAggregateQueries.commandUsageCounts(serverUUID)));
+        container.putCachingSupplier(ServerKeys.WORLD_TIMES, () -> db.query(ServerAggregateQueries.totalWorldTimes(serverUUID)));
 
         // Calculating getters
         container.putCachingSupplier(ServerKeys.OPERATORS, () -> PlayersMutator.forContainer(container).operators());
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
index 41b96ab8a..319750427 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
@@ -25,9 +25,9 @@ import com.djrapitops.plan.data.store.containers.NetworkContainer;
 import com.djrapitops.plan.data.store.containers.PlayerContainer;
 import com.djrapitops.plan.data.store.containers.ServerContainer;
 import com.djrapitops.plan.db.SQLDB;
-import com.djrapitops.plan.db.access.queries.AggregateQueries;
 import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.ServerAggregateQueries;
 import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.system.database.databases.operation.FetchOperations;
 import com.djrapitops.plan.system.info.server.Server;
@@ -178,7 +178,7 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
 
     @Override
     public Map<UUID, Integer> getPlayersRegisteredForServers(Collection<Server> servers) {
-        return db.query(AggregateQueries.serverUserCounts());
+        return db.query(ServerAggregateQueries.serverUserCounts());
     }
 
     @Override
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
index 3ce56ce9b..f792805b3 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
@@ -170,7 +170,7 @@ public abstract class CommonDBTest {
 
         commitTest();
 
-        Map<String, Integer> commandUse = db.query(AggregateQueries.commandUsageCounts(serverUUID));
+        Map<String, Integer> commandUse = db.query(ServerAggregateQueries.commandUsageCounts(serverUUID));
         assertEquals(expected, commandUse);
     }
 
@@ -189,7 +189,7 @@ public abstract class CommonDBTest {
         useCommand("test", 3);
         useCommand("tp", 2);
 
-        Map<String, Integer> commandUse = db.query(AggregateQueries.commandUsageCounts(serverUUID));
+        Map<String, Integer> commandUse = db.query(ServerAggregateQueries.commandUsageCounts(serverUUID));
         assertEquals(expected, commandUse);
     }
 
@@ -783,13 +783,13 @@ public abstract class CommonDBTest {
     @Test
     public void testGetServerWorldTimes() {
         testSaveSessionsWorldTimes();
-        WorldTimes worldTimesOfServer = db.query(AggregateQueries.totalWorldTimes(serverUUID));
+        WorldTimes worldTimesOfServer = db.query(ServerAggregateQueries.totalWorldTimes(serverUUID));
         assertEquals(createWorldTimes(), worldTimesOfServer);
     }
 
     @Test
     public void testGetServerWorldTimesNoSessions() {
-        WorldTimes worldTimesOfServer = db.query(AggregateQueries.totalWorldTimes(serverUUID));
+        WorldTimes worldTimesOfServer = db.query(ServerAggregateQueries.totalWorldTimes(serverUUID));
         assertEquals(new WorldTimes(new HashMap<>()), worldTimesOfServer);
     }