Major naming refactoring, WARNING: DB SCHEMA IS NOT BACKWARDS COMPATIBLE