clean up the names