Rename and update namespace