Use dimension constants in warp data and add map name consisntency