Undo the last commit, using $name is fine
Use proper namespace handling for the variables