Mapbuilder wizard stuff improved and some names changed