make mapsuffixes variable naming consistent