Update runtime code naming

Also, add macros so that code generator doesn't
need to know about any runtime variables names
or types