Naming change for consistency
Renamed GatewayProviderFactory to GatewayProviderSettingsFactory
NotificationMethodService and NotificationMessageService