A few name fixes