Ides cleanup

Clear up the names of requested Ides variables.  Added "map" to denote
that the variable should match what is in the map.