Remove prepositions, update name