Updated type naming scheme