Constant values names changed