Do not name variables as builtins

We should not name anything as a reserved word or builtin where it is
possible. This is the HACKING policy in some of the other projects.

Change-Id: I51978839c107a077701f57d05489c32c6ee84cc7
Merge "Do not name variables as builtins"