Making column names match; general water-proofing