Renaming #defines to something less generic