Hey Todd, That's the plan. This patch is a merely step towards this - it just clears all the confusion caused by this double naming used by different toolchains. http://reviews.llvm.org/D4379