Updated type names to follow naming conventions