Rename and fix bugs