Added names to builtin value references to decouple references from order
Fixing bad merge issues