Schema changes

To give table and column names that are closer to rails defaults so that there is less cognitive load in switching between model names and attributes and table and columns names