Renaming #defines to something a little less generic