Changed naming standard for database schema