Cosmetic
Modified type names