Merge pull request #2645 from devoncarew/platform_constants

rename the platform constants