Modified type naming scheme