Rename Variant.cpp to VariantAndConstant.cpp