Switch to CNAMEs in coding conventions

Change-Id: I72383f28dde3cae4dd29ef59c6de6ed616edfe40