diff --git a/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIPIntel.java b/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIp2Intel.java
similarity index 100%
rename from src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIPIntel.java
rename to src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIp2Intel.java
diff --git a/src/main/java/net/frozenorb/apiv3/serialization/mongodb/UUIDCodec.java b/src/main/java/net/frozenorb/apiv3/serialization/mongodb/Uuid2Codec.java
similarity index 100%
rename from src/main/java/net/frozenorb/apiv3/serialization/mongodb/UUIDCodec.java
rename to src/main/java/net/frozenorb/apiv3/serialization/mongodb/Uuid2Codec.java
diff --git a/src/main/java/net/frozenorb/apiv3/serialization/mongodb/UUIDCodecProvider.java b/src/main/java/net/frozenorb/apiv3/serialization/mongodb/Uuid2CodecProvider.java
similarity index 100%
rename from src/main/java/net/frozenorb/apiv3/serialization/mongodb/UUIDCodecProvider.java
rename to src/main/java/net/frozenorb/apiv3/serialization/mongodb/Uuid2CodecProvider.java
diff --git a/src/main/java/net/frozenorb/apiv3/unsorted/BugsnagSlf4j2Logger.java b/src/main/java/net/frozenorb/apiv3/unsorted/BugsnagSlf4jLogger.java
similarity index 100%
rename from src/main/java/net/frozenorb/apiv3/unsorted/BugsnagSlf4j2Logger.java
rename to src/main/java/net/frozenorb/apiv3/unsorted/BugsnagSlf4jLogger.java
diff --git a/src/main/java/net/frozenorb/apiv3/util/Totp2Utils.java b/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java
similarity index 100%
rename from src/main/java/net/frozenorb/apiv3/util/Totp2Utils.java
rename to src/main/java/net/frozenorb/apiv3/util/TotpUtils.java
diff --git a/src/main/java/net/frozenorb/apiv3/util/Uuid2Utils.java b/src/main/java/net/frozenorb/apiv3/util/UuidUtils.java
similarity index 100%
rename from src/main/java/net/frozenorb/apiv3/util/Uuid2Utils.java
rename to src/main/java/net/frozenorb/apiv3/util/UuidUtils.java