Prevent conflicts with predefined names

Bug: 64896
Change-Id: I67ea669a074317f44eb09cf759c0121bad259b3c