updated database naming conventions