Removed Pa prefix from type names