rename and add namespace.