Changed "DEFAULT_..." macros to "STANDARD_..." to indicate that they can still be used by calling code