Variable naming more consistent with variants