Use $namespace instead of :local, add substitution