Merge "rdbms: various field name and style cleanups to Database"