Renamed some columns in the db.  Made the corresponding changes.