Switched to #defines with appropriate casing