Switching to using all aliases for "defines" instead of some aliases some paths