Altered table/row names to match in our program