DB Conversion

Updated Queries
Semantic Renaming