Rename variables of the test section to conform to naming scheme