Replaced variables with namespaced vars