Fix duplicated namespsace prefixing