Updated namespaces of variables