fixed a lot of names