Feature/global var names