change anme and fix spaces