Updated type naming for consistency