more consistent naming in Constant