Rename namespaces to remove non-portable "clr" name.