Semantic changes

Capitalization of global-scope variable names