Simplifying vars

more descriptive so automated search replace for building faster