Changed Macros to NSString Constants