diff --git a/src/main/java/mrnavastar/sqlib/Table.java b/src/main/java/mrnavastar/sqlib/Table.java
index 8bee022..fb6bb49 100644
--- a/src/main/java/mrnavastar/sqlib/Table.java
+++ b/src/main/java/mrnavastar/sqlib/Table.java
@@ -42,7 +42,7 @@ public String getName() {
     }
 
     public String getNoConflictName() {
-        return modId + ":" + name;
+        return modId + "_" + name;
     }
 
     public Database getDatabase() {
diff --git a/src/main/java/mrnavastar/sqlib/database/Database.java b/src/main/java/mrnavastar/sqlib/database/Database.java
index 9ea2657..d420934 100644
--- a/src/main/java/mrnavastar/sqlib/database/Database.java
+++ b/src/main/java/mrnavastar/sqlib/database/Database.java
@@ -51,7 +51,7 @@ public void addTable(Table table) {
     }
 
     public Table getTable(String name) {
-        return tables.get(modId + ":" + name);
+        return tables.get(modId + "_" + name);
     }
 
     public ArrayList<Table> getTables() {
diff --git a/src/main/java/mrnavastar/sqlib/database/PostgreSQLDatabase.java b/src/main/java/mrnavastar/sqlib/database/PostgreSQLDatabase.java
index ccadfb6..f3684ca 100644
--- a/src/main/java/mrnavastar/sqlib/database/PostgreSQLDatabase.java
+++ b/src/main/java/mrnavastar/sqlib/database/PostgreSQLDatabase.java
@@ -23,7 +23,7 @@ public String getConnectionUrl() {
         return "jdbc:postgresql://" + address + ":" + port + "/" + name;
     }
 
-        @Override
+    @Override
     public Properties getConnectionProperties() {
         Properties properties = new Properties();
         properties.put("user", username);