refactored define names