Renaming of defines for clarity