diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/database/wrapper/AbstractRepositoryOrmLite.java b/eternalcore-core/src/main/java/com/eternalcode/core/database/AbstractRepositoryOrmLite.java
similarity index 95%
rename from eternalcore-core/src/main/java/com/eternalcode/core/database/wrapper/AbstractRepositoryOrmLite.java
rename to eternalcore-core/src/main/java/com/eternalcode/core/database/AbstractRepositoryOrmLite.java
index 05dbaaa54..476303b88 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/database/wrapper/AbstractRepositoryOrmLite.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/database/AbstractRepositoryOrmLite.java
@@ -1,7 +1,6 @@
-package com.eternalcode.core.database.wrapper;
+package com.eternalcode.core.database;
 
 import com.eternalcode.commons.scheduler.Scheduler;
-import com.eternalcode.core.database.DatabaseManager;
 import com.j256.ormlite.dao.Dao;
 import panda.std.function.ThrowingFunction;
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/database/DatabaseManager.java b/eternalcore-core/src/main/java/com/eternalcode/core/database/DatabaseManager.java
index 6a00afa17..ddb360459 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/database/DatabaseManager.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/database/DatabaseManager.java
@@ -73,7 +73,7 @@ public void connect() throws SQLException {
 
             case POSTGRESQL -> {
                 this.dataSource.setDriverClassName("org.postgresql.Driver");
-                this.dataSource.setJdbcUrl("jdbc:postgresql://" + this.config.database.hostname + ":" + this.config.database.port + "/");
+                this.dataSource.setJdbcUrl("jdbc:postgresql://" + this.config.database.hostname + ":" + this.config.database.port + "/" + this.config.database.database);
             }
 
             default -> throw new SQLException("SQL type '" + databaseType + "' not found");
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/LocationPersister.java b/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/LocationPersister.java
index acae0f02a..dee6b95b0 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/LocationPersister.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/LocationPersister.java
@@ -30,7 +30,7 @@ public Object javaToSqlArg(FieldType fieldType, Object javaObject) {
             worldName = loc.getWorld().getName();
         }
 
-        return worldName + "/" + loc.getX() + "/" + loc.getY() + "/" + loc.getZ() + "/" + loc.getYaw() + "/" + loc.getPitch();
+        return worldName + "/" + loc.getBlockX() + "/" + loc.getBlockY() + "/" + loc.getBlockZ() + "/" + loc.getYaw() + "/" + loc.getPitch();
     }
 
     @Override
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepositoryOrmLite.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepositoryOrmLite.java
index e1b5ee5e2..173ca8fcf 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepositoryOrmLite.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepositoryOrmLite.java
@@ -2,7 +2,7 @@
 
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.database.DatabaseManager;
-import com.eternalcode.core.database.wrapper.AbstractRepositoryOrmLite;
+import com.eternalcode.core.database.AbstractRepositoryOrmLite;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Repository;
 import com.j256.ormlite.stmt.Where;
@@ -30,7 +30,7 @@ public CompletableFuture<Set<UUID>> findReceivers(Set<UUID> onlineUniqueIds) {
             return CompletableFuture.completedFuture(onlineUniqueIds);
         }
 
-        CompletableFuture<List<AutoMessageTable>> wrapperList =
+        CompletableFuture<List<AutoMessageTable>> tableList =
             this.action(
                 AutoMessageTable.class, dao -> {
                 Where<AutoMessageTable, Object> where = dao.queryBuilder().where();
@@ -38,9 +38,9 @@ public CompletableFuture<Set<UUID>> findReceivers(Set<UUID> onlineUniqueIds) {
                 return where.query();
             });
 
-        return wrapperList.thenApply(ignores -> {
+        return tableList.thenApply(ignores -> {
             Set<UUID> ignoredIds = ignores.stream()
-                .map(wrapper -> wrapper.uniqueId)
+                .map(autoMessageTable -> autoMessageTable.uniqueId)
                 .collect(Collectors.toSet());
 
             return onlineUniqueIds.stream()
@@ -62,8 +62,8 @@ public CompletableFuture<Boolean> switchReceiving(UUID uniqueId) {
                     .thenApply(result -> false);
             }
 
-            AutoMessageTable wrapper = optional.get();
-            return this.delete(AutoMessageTable.class, wrapper).thenApply(state -> true);
+            AutoMessageTable autoMessageTable = optional.get();
+            return this.delete(AutoMessageTable.class, autoMessageTable).thenApply(state -> true);
         });
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeRepositoryOrmLite.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeRepositoryOrmLite.java
index 6db16e66c..442fe2ad7 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeRepositoryOrmLite.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeRepositoryOrmLite.java
@@ -2,7 +2,7 @@
 
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.database.DatabaseManager;
-import com.eternalcode.core.database.wrapper.AbstractRepositoryOrmLite;
+import com.eternalcode.core.database.AbstractRepositoryOrmLite;
 import com.eternalcode.core.feature.home.Home;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Repository;
@@ -25,50 +25,50 @@ class HomeRepositoryOrmLite extends AbstractRepositoryOrmLite implements HomeRep
     @Inject
     private HomeRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) throws SQLException {
         super(databaseManager, scheduler);
-        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), HomeWrapper.class);
+        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), HomeTable.class);
     }
 
     @Override
     public CompletableFuture<Optional<Home>> getHome(UUID playerUniqueId) {
-        return this.select(HomeWrapper.class, playerUniqueId)
+        return this.select(HomeTable.class, playerUniqueId)
             .thenApply(Optional::of)
-            .thenApply(home -> home.map(HomeWrapper::toHome));
+            .thenApply(home -> home.map(HomeTable::toHome));
     }
 
     @Override
     public CompletableFuture<Optional<Home>> getHome(User user, String homeName) {
-        return this.action(HomeWrapper.class, dao -> Optional.ofNullable(dao.queryBuilder()
+        return this.action(HomeTable.class, dao -> Optional.ofNullable(dao.queryBuilder()
             .where()
             .eq(OWNER_COLUMN, user.getUniqueId())
             .and()
             .eq(NAME_COLUMN, homeName)
-            .queryForFirst()).map(HomeWrapper::toHome));
+            .queryForFirst()).map(HomeTable::toHome));
     }
 
     @Override
     public CompletableFuture<Optional<Home>> getHome(UUID playerUniqueId, String homeName) {
-        return this.action(HomeWrapper.class, dao -> Optional.ofNullable(dao.queryBuilder()
+        return this.action(HomeTable.class, dao -> Optional.ofNullable(dao.queryBuilder()
             .where()
             .eq(OWNER_COLUMN, playerUniqueId)
             .and()
             .eq(NAME_COLUMN, homeName)
-            .queryForFirst()).map(HomeWrapper::toHome));
+            .queryForFirst()).map(HomeTable::toHome));
     }
 
     @Override
     public CompletableFuture<Void> saveHome(Home home) {
-        return this.save(HomeWrapper.class, HomeWrapper.from(home)).thenApply(result -> null);
+        return this.save(HomeTable.class, HomeTable.from(home)).thenApply(result -> null);
     }
 
     @Override
     public CompletableFuture<Integer> deleteHome(UUID playerUniqueId) {
-        return this.deleteById(HomeWrapper.class, playerUniqueId);
+        return this.deleteById(HomeTable.class, playerUniqueId);
     }
 
     @Override
     public CompletableFuture<Integer> deleteHome(User user, String homeName) {
-        return this.action(HomeWrapper.class, dao -> {
-            DeleteBuilder<HomeWrapper, Object> builder = dao.deleteBuilder();
+        return this.action(HomeTable.class, dao -> {
+            DeleteBuilder<HomeTable, Object> builder = dao.deleteBuilder();
             builder.where()
                 .eq(OWNER_COLUMN, user.getUniqueId())
                 .and()
@@ -79,8 +79,8 @@ public CompletableFuture<Integer> deleteHome(User user, String homeName) {
 
     @Override
     public CompletableFuture<Integer> deleteHome(UUID playerUniqueId, String homeName) {
-        return this.action(HomeWrapper.class, dao -> {
-            DeleteBuilder<HomeWrapper, Object> builder = dao.deleteBuilder();
+        return this.action(HomeTable.class, dao -> {
+            DeleteBuilder<HomeTable, Object> builder = dao.deleteBuilder();
             builder.where()
                 .eq(OWNER_COLUMN, playerUniqueId)
                 .and()
@@ -91,27 +91,27 @@ public CompletableFuture<Integer> deleteHome(UUID playerUniqueId, String homeNam
 
     @Override
     public CompletableFuture<Set<Home>> getHomes() {
-        return this.selectAll(HomeWrapper.class)
-            .thenApply(homeOrmLites -> homeOrmLites.stream().map(HomeWrapper::toHome).collect(Collectors.toSet()));
+        return this.selectAll(HomeTable.class)
+            .thenApply(homeOrmLites -> homeOrmLites.stream().map(HomeTable::toHome).collect(Collectors.toSet()));
     }
 
     @Override
     public CompletableFuture<Set<Home>> getHomes(User user) {
-        return this.action(HomeWrapper.class, dao -> dao.queryBuilder()
+        return this.action(HomeTable.class, dao -> dao.queryBuilder()
             .where()
             .eq(OWNER_COLUMN, user.getUniqueId())
             .query()).thenApply(homes -> homes.stream()
-            .map(HomeWrapper::toHome)
+            .map(HomeTable::toHome)
             .collect(Collectors.toSet()));
     }
 
     @Override
     public CompletableFuture<Set<Home>> getHomes(UUID playerUniqueId) {
-        return this.action(HomeWrapper.class, dao -> dao.queryBuilder()
+        return this.action(HomeTable.class, dao -> dao.queryBuilder()
             .where()
             .eq(OWNER_COLUMN, playerUniqueId)
             .query()).thenApply(homes -> homes.stream()
-            .map(HomeWrapper::toHome)
+            .map(HomeTable::toHome)
             .collect(Collectors.toSet()));
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeWrapper.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
similarity index 79%
rename from eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeWrapper.java
rename to eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
index 2609ada0b..fd8e913d0 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeWrapper.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
@@ -9,7 +9,7 @@
 import org.bukkit.Location;
 
 @DatabaseTable(tableName = "eternal_core_homes")
-class HomeWrapper {
+class HomeTable {
 
     @DatabaseField(columnName = "id", id = true)
     private UUID uuid;
@@ -23,9 +23,9 @@ class HomeWrapper {
     @DatabaseField(columnName = "location", persisterClass = LocationPersister.class)
     private Location location;
 
-    HomeWrapper() {}
+    HomeTable() {}
 
-    HomeWrapper(UUID uuid, UUID owner, String name, Location location) {
+    HomeTable(UUID uuid, UUID owner, String name, Location location) {
         this.uuid = uuid;
         this.owner = owner;
         this.name = name;
@@ -36,8 +36,8 @@ Home toHome() {
         return new HomeImpl(this.uuid, this.owner, this.name, this.location);
     }
 
-    static HomeWrapper from(Home home) {
-        return new HomeWrapper(home.getUuid(), home.getOwner(), home.getName(), home.getLocation());
+    static HomeTable from(Home home) {
+        return new HomeTable(home.getUuid(), home.getOwner(), home.getName(), home.getLocation());
     }
 }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/ignore/IgnoreRepositoryOrmLite.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/ignore/IgnoreRepositoryOrmLite.java
index 7531dc581..52365f64b 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/ignore/IgnoreRepositoryOrmLite.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/ignore/IgnoreRepositoryOrmLite.java
@@ -2,7 +2,7 @@
 
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.database.DatabaseManager;
-import com.eternalcode.core.database.wrapper.AbstractRepositoryOrmLite;
+import com.eternalcode.core.database.AbstractRepositoryOrmLite;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Repository;
 import com.google.common.cache.CacheBuilder;
@@ -29,19 +29,19 @@ class IgnoreRepositoryOrmLite extends AbstractRepositoryOrmLite implements Ignor
 
     private static final UUID IGNORE_ALL = UUID.nameUUIDFromBytes("*".getBytes());
 
-    private final Dao<IgnoreWrapper, Long> cachedDao;
+    private final Dao<IgnoreTable, Long> cachedDao;
     private final LoadingCache<UUID, Set<UUID>> ignores;
 
     @Inject
     private IgnoreRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) throws SQLException {
         super(databaseManager, scheduler);
-        this.cachedDao = databaseManager.getDao(IgnoreWrapper.class);
+        this.cachedDao = databaseManager.getDao(IgnoreTable.class);
 
         this.ignores = CacheBuilder.newBuilder()
             .expireAfterAccess(Duration.ofMinutes(15))
             .refreshAfterWrite(Duration.ofMinutes(3))
             .build(new IgnoreLoader());
-        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), IgnoreWrapper.class);
+        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), IgnoreTable.class);
     }
 
     @Override
@@ -65,7 +65,7 @@ public CompletableFuture<Void> ignore(UUID by, UUID target) {
                 Set<UUID> uuids = this.ignores.get(by);
 
                 if (!uuids.contains(target)) {
-                    this.save(IgnoreWrapper.class, new IgnoreWrapper(by, target))
+                    this.save(IgnoreTable.class, new IgnoreTable(by, target))
                         .thenRun(() -> this.ignores.refresh(by));
                 }
             }
@@ -82,8 +82,8 @@ public CompletableFuture<Void> ignoreAll(UUID by) {
 
     @Override
     public CompletableFuture<Void> unIgnore(UUID by, UUID target) {
-        return this.action(IgnoreWrapper.class, dao -> {
-                DeleteBuilder<IgnoreWrapper, Object> builder = dao.deleteBuilder();
+        return this.action(IgnoreTable.class, dao -> {
+                DeleteBuilder<IgnoreTable, Object> builder = dao.deleteBuilder();
 
                 builder.where()
                     .eq("player_id", by)
@@ -97,8 +97,8 @@ public CompletableFuture<Void> unIgnore(UUID by, UUID target) {
 
     @Override
     public CompletableFuture<Void> unIgnoreAll(UUID by) {
-        return this.action(IgnoreWrapper.class, dao -> {
-                DeleteBuilder<IgnoreWrapper, Object> builder = dao.deleteBuilder();
+        return this.action(IgnoreTable.class, dao -> {
+                DeleteBuilder<IgnoreTable, Object> builder = dao.deleteBuilder();
 
                 builder.where()
                     .eq("player_id", by);
@@ -111,14 +111,14 @@ public CompletableFuture<Void> unIgnoreAll(UUID by) {
     @ApiStatus.Internal
     @Override
     public CompletableFuture<Void> purgeAll() {
-        return this.deleteAll(IgnoreWrapper.class)
+        return this.deleteAll(IgnoreTable.class)
             .thenRun(this.ignores::invalidateAll);
     }
 
     @DatabaseTable(tableName = "eternal_core_ignores")
-    private static class IgnoreWrapper {
+    private static class IgnoreTable {
 
-        @DatabaseField(generatedId = true)
+        @DatabaseField(id = true)
         Long id;
 
         @DatabaseField(columnName = "player_id", uniqueCombo = true)
@@ -127,9 +127,9 @@ private static class IgnoreWrapper {
         @DatabaseField(columnName = "ignored_id", uniqueCombo = true)
         UUID ignoredUuid;
 
-        IgnoreWrapper() {}
+        IgnoreTable() {}
 
-        IgnoreWrapper(UUID playerUuid, UUID ignoredUuid) {
+        IgnoreTable(UUID playerUuid, UUID ignoredUuid) {
             this.playerUuid = playerUuid;
             this.ignoredUuid = ignoredUuid;
         }
@@ -143,7 +143,7 @@ private class IgnoreLoader extends CacheLoader<UUID, Set<UUID>> {
                 .where().eq("player_id", key)
                 .query()
                 .stream()
-                .map(ignoreWrapper -> ignoreWrapper.ignoredUuid)
+                .map(ignoreTable -> ignoreTable.ignoredUuid)
                 .collect(Collectors.toSet());
         }
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepositoryOrmLite.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepositoryOrmLite.java
index 3160ac541..83e1fbe57 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepositoryOrmLite.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepositoryOrmLite.java
@@ -2,7 +2,7 @@
 
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.database.DatabaseManager;
-import com.eternalcode.core.database.wrapper.AbstractRepositoryOrmLite;
+import com.eternalcode.core.database.AbstractRepositoryOrmLite;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Repository;
 
@@ -22,49 +22,49 @@ class PrisonerRepositoryOrmLite extends AbstractRepositoryOrmLite implements Pri
     @Inject
     private PrisonerRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) throws SQLException {
         super(databaseManager, scheduler);
-        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), PrisonerWrapper.class);
+        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), PrisonerTable.class);
     }
 
     @Override
     public CompletableFuture<Optional<JailedPlayer>> getPrisoner(UUID uuid) {
-        return this.selectSafe(PrisonerWrapper.class, uuid)
-            .thenApply(optional -> optional.map(prisonerWrapper -> prisonerWrapper.toPrisoner()));
+        return this.selectSafe(PrisonerTable.class, uuid)
+            .thenApply(optional -> optional.map(prisonerTable -> prisonerTable.toPrisoner()));
     }
 
     @Override
     public CompletableFuture<Set<JailedPlayer>> getPrisoners() {
-        return this.selectAll(PrisonerWrapper.class)
-            .thenApply(prisonerWrappers -> prisonerWrappers.stream()
-                .map(PrisonerWrapper::toPrisoner)
+        return this.selectAll(PrisonerTable.class)
+            .thenApply(prisonerTables -> prisonerTables.stream()
+                .map(PrisonerTable::toPrisoner)
                 .collect(Collectors.toSet()));
     }
 
     @Override
     public void deletePrisoner(UUID uuid) {
-        this.deleteById(PrisonerWrapper.class, uuid);
+        this.deleteById(PrisonerTable.class, uuid);
     }
 
     @Override
     public void editPrisoner(JailedPlayer jailedPlayer) {
-        this.save(PrisonerWrapper.class, PrisonerWrapper.from(jailedPlayer));
+        this.save(PrisonerTable.class, PrisonerTable.from(jailedPlayer));
     }
 
     @Override
     public void deleteAllPrisoners() {
-        this.delete(PrisonerWrapper.class, new PrisonerWrapper());
+        this.delete(PrisonerTable.class, new PrisonerTable());
     }
 
     @Override
     public CompletableFuture<List<JailedPlayer>> getAllPrisoners() {
-        return this.selectAll(PrisonerWrapper.class)
-            .thenApply(prisonerWrappers -> prisonerWrappers.stream()
-                .map(PrisonerWrapper::toPrisoner)
+        return this.selectAll(PrisonerTable.class)
+            .thenApply(prisonerTables -> prisonerTables.stream()
+                .map(PrisonerTable::toPrisoner)
                 .toList());
     }
 
     @Override
     public void savePrisoner(JailedPlayer jailedPlayer) {
-        this.save(PrisonerWrapper.class, PrisonerWrapper.from(jailedPlayer));
+        this.save(PrisonerTable.class, PrisonerTable.from(jailedPlayer));
     }
 
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerWrapper.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
similarity index 83%
rename from eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerWrapper.java
rename to eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
index fa5251b46..05b587d1c 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerWrapper.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
@@ -9,7 +9,7 @@
 import java.util.UUID;
 
 @DatabaseTable(tableName = "eternal_core_prisoners")
-class PrisonerWrapper {
+class PrisonerTable {
 
     @DatabaseField(columnName = "id", id = true)
     private UUID uuid;
@@ -24,10 +24,10 @@ class PrisonerWrapper {
     @DatabaseField(columnName = "detained_by")
     private String detainedBy;
 
-    PrisonerWrapper() {
+    PrisonerTable() {
     }
 
-    PrisonerWrapper(UUID uuid, Instant detainedAt, Duration duration, String detainedBy) {
+    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy) {
         this.uuid = uuid;
         this.detainedAt = detainedAt;
         this.duration = duration;
@@ -38,8 +38,8 @@ JailedPlayer toPrisoner() {
         return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy);
     }
 
-    static PrisonerWrapper from(JailedPlayer jailedPlayer) {
-        return new PrisonerWrapper(
+    static PrisonerTable from(JailedPlayer jailedPlayer) {
+        return new PrisonerTable(
             jailedPlayer.getPlayerUniqueId(),
             jailedPlayer.getDetainedAt(),
             jailedPlayer.getPrisonTime(),
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/language/LanguageRepositoryImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/language/LanguageRepositoryImpl.java
index d7b2947bc..f697ada6b 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/language/LanguageRepositoryImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/language/LanguageRepositoryImpl.java
@@ -2,7 +2,7 @@
 
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.database.DatabaseManager;
-import com.eternalcode.core.database.wrapper.AbstractRepositoryOrmLite;
+import com.eternalcode.core.database.AbstractRepositoryOrmLite;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Repository;
 import com.j256.ormlite.field.DatabaseField;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateRepositoryOrmLite.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateRepositoryOrmLite.java
index e0376e564..db13015f7 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateRepositoryOrmLite.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateRepositoryOrmLite.java
@@ -2,7 +2,7 @@
 
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.database.DatabaseManager;
-import com.eternalcode.core.database.wrapper.AbstractRepositoryOrmLite;
+import com.eternalcode.core.database.AbstractRepositoryOrmLite;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Repository;
 import com.j256.ormlite.table.TableUtils;
@@ -16,20 +16,20 @@ class PrivateChatStateRepositoryOrmLite extends AbstractRepositoryOrmLite implem
     @Inject
     private PrivateChatStateRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) throws SQLException {
         super(databaseManager, scheduler);
-        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), PrivateChatStateWrapper.class);
+        TableUtils.createTableIfNotExists(databaseManager.connectionSource(), PrivateChatStateTable.class);
     }
 
     @Override
     public CompletableFuture<PrivateChatState> getPrivateChatState(UUID uuid) {
-        return this.selectSafe(PrivateChatStateWrapper.class, uuid)
+        return this.selectSafe(PrivateChatStateTable.class, uuid)
             .thenApply(
-                optional -> optional.map(PrivateChatStateWrapper::isEnabled).orElse(PrivateChatState.ENABLE)
+                optional -> optional.map(PrivateChatStateTable::isEnabled).orElse(PrivateChatState.ENABLE)
             ).exceptionally(throwable -> PrivateChatState.ENABLE);
     }
 
     @Override
     public CompletableFuture<Void> setPrivateChatState(UUID uuid, PrivateChatState state) {
-        return this.save(PrivateChatStateWrapper.class, new PrivateChatStateWrapper(uuid, state))
+        return this.save(PrivateChatStateTable.class, new PrivateChatStateTable(uuid, state))
             .thenApply(status -> null);
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateWrapper.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateTable.java
similarity index 80%
rename from eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateWrapper.java
rename to eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateTable.java
index c87dbccd1..159bd7a99 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateWrapper.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/privatechat/toggle/PrivateChatStateTable.java
@@ -5,7 +5,7 @@
 import java.util.UUID;
 
 @DatabaseTable(tableName = "eternal_core_private_chat_state")
-class PrivateChatStateWrapper {
+class PrivateChatStateTable {
 
     @DatabaseField(columnName = "id", id = true)
     private UUID uniqueId;
@@ -13,12 +13,12 @@ class PrivateChatStateWrapper {
     @DatabaseField(columnName = "enabled")
     private PrivateChatState state;
 
-    PrivateChatStateWrapper(UUID id, PrivateChatState enabled) {
+    PrivateChatStateTable(UUID id, PrivateChatState enabled) {
         this.uniqueId = id;
         this.state = enabled;
     }
 
-    PrivateChatStateWrapper() {}
+    PrivateChatStateTable() {}
 
     PrivateChatState isEnabled() {
         return this.state;