Rename variables to match go convention