Internal naming convention consistency change. llvm-svn: 201858 GitOrigin-RevId: 0da851591079445cb788cddb283b01cdaeb06672