rename and fix things