Use dimension constants in warp data and add map name consisntency
A little more map name consistency