diff --git a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Beatmap.kt b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Beatmap.kt
index a7c579d..e5e9f49 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Beatmap.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Beatmap.kt
@@ -17,7 +17,7 @@ public data class Beatmap(
     // Optionals
     public val beatmapset: Beatmapset?,
     public val checksum: String?,
-    public val failtimes: Failtimes?,
+    public val failtimes: BeatmapFailtimes?,
     public val maxCombo: Int?,
 
     // Extended
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Failtimes.kt b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapFailtimes.kt
similarity index 92%
rename from src/main/kotlin/one/devos/osuv2kt/models/beatmap/Failtimes.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapFailtimes.kt
index f5e1e1e..9989eff 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Failtimes.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapFailtimes.kt
@@ -1,6 +1,6 @@
 package one.devos.osuv2kt.models.beatmap
 
-public data class Failtimes(
+public data class BeatmapFailtimes(
     val exit: IntArray?,
     val fail: IntArray?
 ) {
@@ -8,7 +8,7 @@ public data class Failtimes(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as Failtimes
+        other as BeatmapFailtimes
 
         if (exit != null) {
             if (other.exit == null) return false
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Beatmapset.kt b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Beatmapset.kt
index 5b2e3c0..a708c5e 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Beatmapset.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Beatmapset.kt
@@ -24,7 +24,7 @@ public data class Beatmapset(
     // Optionals
     public val beatmaps: Array<Beatmap>,
     public val converts: Any?,
-    public val currentNominations: Array<Nomination>?,
+    public val currentNominations: Array<BeatmapsetNomination>?,
     public val currentUserAttributes: Any?,
     public val description: Any?,
     public val discussions: Any?,
@@ -41,16 +41,16 @@ public data class Beatmapset(
     public val trackId: Int?,
 
     // Extended
-    public val availability: Availability,
+    public val availability: BeatmapsetAvailability,
     public val bpm: Float?,
     public val canBeHyped: Boolean?,
     public val deletedAt: OffsetDateTime?,
     public val discussionLocked: Boolean?,
-    public val hype: Hype,
+    public val hype: BeatmapsetHype,
     public val isScoreable: Boolean?,
     public val lastUpdated: OffsetDateTime?,
     public val legacyThreadUrl: String?,
-    public val nominationsSummary: NominationsSummary,
+    public val nominationsSummary: BeatmapsetNominationsSummary,
     public val ranked: Int?,
     public val rankedDate: OffsetDateTime?,
     public val storyboard: Boolean?,
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Availability.kt b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetAvailability.kt
similarity index 75%
rename from src/main/kotlin/one/devos/osuv2kt/models/beatmap/Availability.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetAvailability.kt
index 5a8446e..50383cd 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Availability.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetAvailability.kt
@@ -1,6 +1,6 @@
 package one.devos.osuv2kt.models.beatmap
 
-public data class Availability(
+public data class BeatmapsetAvailability(
     public val downloadDisabled: Boolean,
     public val moreInformation: String?
 )
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Hype.kt b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetHype.kt
similarity index 75%
rename from src/main/kotlin/one/devos/osuv2kt/models/beatmap/Hype.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetHype.kt
index b0668e1..6c86821 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Hype.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetHype.kt
@@ -1,6 +1,6 @@
 package one.devos.osuv2kt.models.beatmap
 
-public data class Hype(
+public data class BeatmapsetHype(
     public val current: Int,
     public val required: Int
 )
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Nomination.kt b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetNomination.kt
similarity index 82%
rename from src/main/kotlin/one/devos/osuv2kt/models/beatmap/Nomination.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetNomination.kt
index 96f6187..966ebb9 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/Nomination.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetNomination.kt
@@ -2,7 +2,7 @@ package one.devos.osuv2kt.models.beatmap
 
 import one.devos.osuv2kt.models.Ruleset
 
-public data class Nomination(
+public data class BeatmapsetNomination(
     val beatmapsetId: Int,
     val rulesets: Array<Ruleset>,
     val reset: Boolean,
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/NominationsSummary.kt b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetNominationsSummary.kt
similarity index 68%
rename from src/main/kotlin/one/devos/osuv2kt/models/beatmap/NominationsSummary.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetNominationsSummary.kt
index cbb3d65..2ff71b4 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/beatmap/NominationsSummary.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/beatmap/BeatmapsetNominationsSummary.kt
@@ -1,6 +1,6 @@
 package one.devos.osuv2kt.models.beatmap
 
-public data class NominationsSummary(
+public data class BeatmapsetNominationsSummary(
     public val current: Int,
     public val required: Int,
 )
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/user/User.kt b/src/main/kotlin/one/devos/osuv2kt/models/user/User.kt
index 467be50..ded86cc 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/user/User.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/user/User.kt
@@ -17,7 +17,7 @@ public data class User(
     public val isOnline: Boolean,
     public val isRestricted: Boolean,
     public val isSupporter: Boolean,
-    public val kudosu: Kudosu,
+    public val kudosu: UserKudosu,
     public val lastVisit: OffsetDateTime,
     public val pmFriendsOnly: Boolean,
     public val profileColour: Color?,
@@ -25,7 +25,7 @@ public data class User(
 
     // Optionals
     public val accountHistory: Array<UserAccountHistory>?,
-    public val activeTournamentBanners: Array<ProfileBanner>?,
+    public val activeTournamentBanners: Array<UserProfileBanner>?,
     public val badges: Array<UserBadge>?,
     public val beatmapPlaycountsCount: Int?,
     public val blocks: Any?,
@@ -41,7 +41,7 @@ public data class User(
     public val page: Any?,
     public val pendingBeatmapsetCount: Any?,
     public val previousUsernames: Any?,
-    public val rankHighest: RankHighest?,
+    public val rankHighest: UserRankHighest?,
     public val rankHistory: Any?,
     public val rankedBeatmapsetCount: Any?,
     public val replaysWatchedCounts: Any?,
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/user/GradeCounts.kt b/src/main/kotlin/one/devos/osuv2kt/models/user/UserGradeCounts.kt
similarity index 77%
rename from src/main/kotlin/one/devos/osuv2kt/models/user/GradeCounts.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/user/UserGradeCounts.kt
index c5eedda..390a96b 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/user/GradeCounts.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/user/UserGradeCounts.kt
@@ -1,6 +1,6 @@
 package one.devos.osuv2kt.models.user
 
-public data class GradeCounts(
+public data class UserGradeCounts(
     val a: Int,
     val s: Int,
     val sh: Int,
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/user/Kudosu.kt b/src/main/kotlin/one/devos/osuv2kt/models/user/UserKudosu.kt
similarity index 76%
rename from src/main/kotlin/one/devos/osuv2kt/models/user/Kudosu.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/user/UserKudosu.kt
index e72d98d..3a76506 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/user/Kudosu.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/user/UserKudosu.kt
@@ -1,6 +1,6 @@
 package one.devos.osuv2kt.models.user
 
-public data class Kudosu(
+public data class UserKudosu(
     public val available: Int,
     public val total: Int
 )
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/user/Level.kt b/src/main/kotlin/one/devos/osuv2kt/models/user/UserLevel.kt
similarity index 77%
rename from src/main/kotlin/one/devos/osuv2kt/models/user/Level.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/user/UserLevel.kt
index 35aae50..d018f6c 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/user/Level.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/user/UserLevel.kt
@@ -1,6 +1,6 @@
 package one.devos.osuv2kt.models.user
 
-public data class Level(
+public data class UserLevel(
     public val current: Int,
     public val progress: Float
 )
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/user/ProfileBanner.kt b/src/main/kotlin/one/devos/osuv2kt/models/user/UserProfileBanner.kt
similarity index 86%
rename from src/main/kotlin/one/devos/osuv2kt/models/user/ProfileBanner.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/user/UserProfileBanner.kt
index c57761c..ba99d59 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/user/ProfileBanner.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/user/UserProfileBanner.kt
@@ -2,7 +2,7 @@ package one.devos.osuv2kt.models.user
 
 import com.google.gson.annotations.SerializedName
 
-public data class ProfileBanner(
+public data class UserProfileBanner(
     public val id: Int,
     public val tournamentId: Int,
     public val image: String?,
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/user/RankHighest.kt b/src/main/kotlin/one/devos/osuv2kt/models/user/UserRankHighest.kt
similarity index 80%
rename from src/main/kotlin/one/devos/osuv2kt/models/user/RankHighest.kt
rename to src/main/kotlin/one/devos/osuv2kt/models/user/UserRankHighest.kt
index c9ff140..86b7eb8 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/user/RankHighest.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/user/UserRankHighest.kt
@@ -2,7 +2,7 @@ package one.devos.osuv2kt.models.user
 
 import java.time.OffsetDateTime
 
-public data class RankHighest(
+public data class UserRankHighest(
     public val rank: Int,
     public val updatedAt: OffsetDateTime
 )
diff --git a/src/main/kotlin/one/devos/osuv2kt/models/user/UserStatistics.kt b/src/main/kotlin/one/devos/osuv2kt/models/user/UserStatistics.kt
index 9fe765a..17a0d7e 100644
--- a/src/main/kotlin/one/devos/osuv2kt/models/user/UserStatistics.kt
+++ b/src/main/kotlin/one/devos/osuv2kt/models/user/UserStatistics.kt
@@ -6,10 +6,10 @@ public data class UserStatistics(
     public val count50: Int,
     public val countMiss: Int,
     public val countryRank: Int?,
-    public val gradeCounts: GradeCounts,
+    public val gradeCounts: UserGradeCounts,
     public val hitAccuracy: Float,
     public val isRanked: Boolean,
-    public val level: Level,
+    public val level: UserLevel,
     public val maximumCombo: Int,
     public val playCount: Int,
     public val playTime: Int,