rename and fix spacing