Adjusted naming conventions for database layer.