Added namespacing to vars