Rename and rebuild