Changed a few variable names and one columnNameMapping