GatewayFactory now correctly resolves types with underscores