Rename and bug fixes