REFACTOR:rename variable constants