fixed some naming bugs with ObjectVariantMapper changes