Move GTM, Fix eSpot Names in Mapping