Naming fixes DB structure fixes