Rename pre-processor definitions to be a little more appropriate