Change namespace + url
Fix @grant