cleanup more naming issues with ObjectVariantMapper code