Updated the Database based on the new naming conventions