refactor: Change table names, replace native queries with a non-native

refactor: Change table names, replace native queries with a non-native #1366