Rename remaining types so that all begin Payment*

third_party/WebKit/Source/modules/modules.gypi

 {
   'includes': [
     '../core/core_generated.gypi',
     'modules_generated.gypi',
   ],
   'variables': {
     # Experimental hooks for embedder to provide extra IDL and source files.
     #
     # Note: this is not a supported API. If you rely on this, you will be broken
     # from time to time as the code generator changes in backward incompatible
@@ skipping 489 matching lines @@
       'mediastream/RTCOfferOptions.idl',
       'mediastream/RTCSessionDescriptionInit.idl',
       'nfc/NFCMessage.idl',
       'nfc/NFCPushOptions.idl',
       'nfc/NFCRecord.idl',
       'nfc/NFCWatchOptions.idl',
       'notifications/GetNotificationOptions.idl',
       'notifications/NotificationAction.idl',
       'notifications/NotificationEventInit.idl',
       'notifications/NotificationOptions.idl',
-      'payments/CurrencyAmount.idl',
+      'payments/PaymentCurrencyAmount.idl',
       'payments/PaymentDetails.idl',
       'payments/PaymentItem.idl',
       'payments/PaymentMethodData.idl',
       'payments/PaymentOptions.idl',
       'payments/PaymentRequestUpdateEventInit.idl',
-      'payments/ShippingOption.idl',
+      'payments/PaymentShippingOption.idl',
       'permissions/MidiPermissionDescriptor.idl',
       'permissions/PermissionDescriptor.idl',
       'permissions/PushPermissionDescriptor.idl',
       'presentation/PresentationConnectionAvailableEventInit.idl',
       'presentation/PresentationConnectionCloseEventInit.idl',
       'push_messaging/PushEventInit.idl',
       'push_messaging/PushSubscriptionOptions.idl',
       'quota/StorageEstimate.idl',
       'sensor/SensorErrorEventInit.idl',
       'sensor/SensorReadingEventInit.idl',
@@ skipping 143 matching lines @@
       '<(blink_modules_output_dir)/nfc/NFCWatchOptions.cpp',
       '<(blink_modules_output_dir)/nfc/NFCWatchOptions.h',
       '<(blink_modules_output_dir)/notifications/GetNotificationOptions.cpp',
       '<(blink_modules_output_dir)/notifications/GetNotificationOptions.h',
       '<(blink_modules_output_dir)/notifications/NotificationAction.cpp',
       '<(blink_modules_output_dir)/notifications/NotificationAction.h',
       '<(blink_modules_output_dir)/notifications/NotificationEventInit.cpp',
       '<(blink_modules_output_dir)/notifications/NotificationEventInit.h',
       '<(blink_modules_output_dir)/notifications/NotificationOptions.cpp',
       '<(blink_modules_output_dir)/notifications/NotificationOptions.h',
-      '<(blink_modules_output_dir)/payments/CurrencyAmount.cpp',
-      '<(blink_modules_output_dir)/payments/CurrencyAmount.h',
+      '<(blink_modules_output_dir)/payments/PaymentCurrencyAmount.cpp',
+      '<(blink_modules_output_dir)/payments/PaymentCurrencyAmount.h',
       '<(blink_modules_output_dir)/payments/PaymentDetails.cpp',
       '<(blink_modules_output_dir)/payments/PaymentDetails.h',
       '<(blink_modules_output_dir)/payments/PaymentItem.cpp',
       '<(blink_modules_output_dir)/payments/PaymentItem.h',
       '<(blink_modules_output_dir)/payments/PaymentMethodData.cpp',
       '<(blink_modules_output_dir)/payments/PaymentMethodData.h',
       '<(blink_modules_output_dir)/payments/PaymentOptions.cpp',
       '<(blink_modules_output_dir)/payments/PaymentOptions.h',
       '<(blink_modules_output_dir)/payments/PaymentRequestUpdateEventInit.cpp',
       '<(blink_modules_output_dir)/payments/PaymentRequestUpdateEventInit.h',
-      '<(blink_modules_output_dir)/payments/ShippingOption.cpp',
-      '<(blink_modules_output_dir)/payments/ShippingOption.h',
+      '<(blink_modules_output_dir)/payments/PaymentShippingOption.cpp',
+      '<(blink_modules_output_dir)/payments/PaymentShippingOption.h',
       '<(blink_modules_output_dir)/permissions/MidiPermissionDescriptor.cpp',
       '<(blink_modules_output_dir)/permissions/MidiPermissionDescriptor.h',
       '<(blink_modules_output_dir)/permissions/PermissionDescriptor.cpp',
       '<(blink_modules_output_dir)/permissions/PermissionDescriptor.h',
       '<(blink_modules_output_dir)/permissions/PushPermissionDescriptor.cpp',
       '<(blink_modules_output_dir)/permissions/PushPermissionDescriptor.h',
       '<(blink_modules_output_dir)/presentation/PresentationConnectionAvailableEventInit.cpp',
       '<(blink_modules_output_dir)/presentation/PresentationConnectionAvailableEventInit.h',
       '<(blink_modules_output_dir)/presentation/PresentationConnectionCloseEventInit.cpp',
       '<(blink_modules_output_dir)/presentation/PresentationConnectionCloseEventInit.h',
@@ skipping 1328 matching lines @@
       'webaudio/ConvolverNodeTest.cpp',
       'webaudio/DynamicsCompressorNodeTest.cpp',
       'webaudio/ScriptProcessorNodeTest.cpp',
       'webaudio/StereoPannerNodeTest.cpp',
       'webdatabase/QuotaTrackerTest.cpp',
       'websockets/DOMWebSocketTest.cpp',
       'websockets/DocumentWebSocketChannelTest.cpp',
     ],
   },
 }