another rename, this time with namespaces