Rename and improve