1. Fixed several names