Rejiggered Database Names

Rejiggered Database Table and Column names