Heather cleaned up the column names and types to make them consistent.

