some renames to follow RDBMS conventions