fixed type naming