Fix namespaced keyword conversion, add test and benchmark.