Fixed several names