[Cosmetics] more name fixes