Fixes deprecated variable names (removes accidental namespacing)