diff --git a/Platforms/OSX/AVFoundation.swift b/Platforms/OSX/AVFoundation.swift
index 9383aad..6adbc6b 100644
--- a/Platforms/OSX/AVFoundation.swift
+++ b/Platforms/OSX/AVFoundation.swift
@@ -14000,7 +14000,7 @@ extension AVMetadataItem {
   	@result			An instance of NSArray containing the metadata items of the target NSArray that match the specified identifier.
   */
   @available(OSX 10.10, *)
-  class func metadataItemsFrom(metadataItems: [AVMetadataItem], filteredByIdentifier identifier: String) -> [AVMetadataItem]
+  class func metadataItemsFrom(metadataItems: [AVMetadataItem], filteredBy identifier: String) -> [AVMetadataItem]
 
   /*!
   	@method			metadataItemsFromArray:filteredByMetadataItemFilter:
@@ -14032,9 +14032,9 @@ extension AVMetadataItem {
   @available(OSX 10.10, *)
   class func identifierForKey(key: AnyObject, keySpace: String) -> String?
   @available(OSX 10.10, *)
-  class func keySpaceForIdentifier(identifier: String) -> String?
+  class func keySpaceFor(identifier: String) -> String?
   @available(OSX 10.10, *)
-  class func keyForIdentifier(identifier: String) -> AnyObject?
+  class func keyFor(identifier: String) -> AnyObject?
   @NSCopying var key: protocol<Copying, ObjectProtocol>? { get }
   var commonKey: String? { get }
   var keySpace: String? { get }
diff --git a/Platforms/OSX/Accounts.swift b/Platforms/OSX/Accounts.swift
index 40cd8eb..e3c3463 100644
--- a/Platforms/OSX/Accounts.swift
+++ b/Platforms/OSX/Accounts.swift
@@ -31,7 +31,7 @@ typealias ACAccountStoreCredentialRenewalHandler = (ACAccountCredentialRenewResu
 class ACAccountStore : Object {
   var accounts: [AnyObject]! { get }
   func account(identifier identifier: String!) -> ACAccount!
-  func accountType(accountTypeIdentifier typeIdentifier: String!) -> ACAccountType!
+  func accountType(accountType typeIdentifier: String!) -> ACAccountType!
   func accounts(accountType accountType: ACAccountType!) -> [AnyObject]!
   func saveAccount(account: ACAccount!, withCompletionHandler completionHandler: ACAccountStoreSaveCompletionHandler!)
   func requestAccessToAccounts(type accountType: ACAccountType!, options: [Object : AnyObject]! = [:], completion: ACAccountStoreRequestAccessCompletionHandler!)
diff --git a/Platforms/OSX/AddressBook.swift b/Platforms/OSX/AddressBook.swift
index 15803f0..1e28928 100644
--- a/Platforms/OSX/AddressBook.swift
+++ b/Platforms/OSX/AddressBook.swift
@@ -64,10 +64,22 @@ var kABSearchOr: _ABSearchConjunction { get }
 typealias ABSearchConjunction = CFIndex
 typealias ABRecordRef = UnsafeMutablePointer<Void>
 typealias ABPersonRef = ABPerson
+class ABPerson {
+}
 typealias ABGroupRef = ABGroup
+class ABGroup {
+}
 typealias ABSearchElementRef = ABSearchElement
+class ABSearchElement {
+}
 typealias ABAddressBookRef = ABAddressBook
+class ABAddressBook {
+}
 typealias ABMultiValueRef = ABMultiValue
+class ABMultiValue {
+}
+class ABMutableMultiValue {
+}
 typealias ABMutableMultiValueRef = ABMutableMultiValue
 func ABGetSharedAddressBook() -> Unmanaged<ABAddressBook>!
 func ABCopyArrayOfMatchingRecords(addressBook: ABAddressBook!, _ search: ABSearchElement!) -> Unmanaged<CFArray>!
@@ -389,11 +401,11 @@ class ABMultiValue : Object, Copying, MutableCopying, FastEnumeration {
   func valueAt(index: Int) -> AnyObject!
   func labelAt(index: Int) -> String!
   func identifierAt(index: Int) -> String!
-  func indexForIdentifier(identifier: String!) -> Int
+  func indexFor(identifier: String!) -> Int
   func primaryIdentifier() -> String!
   func propertyType() -> ABPropertyType
-  func valueForIdentifier(identifier: String!) -> AnyObject!
-  func labelForIdentifier(identifier: String!) -> AnyObject!
+  func valueFor(identifier: String!) -> AnyObject!
+  func labelFor(identifier: String!) -> AnyObject!
   init()
   func copy(zone zone: Zone = nil) -> AnyObject
   func mutableCopy(zone zone: Zone = nil) -> AnyObject
diff --git a/Platforms/OSX/AppKit.swift b/Platforms/OSX/AppKit.swift
index 96f2fda..d694c2f 100644
--- a/Platforms/OSX/AppKit.swift
+++ b/Platforms/OSX/AppKit.swift
@@ -4892,9 +4892,9 @@ class NSCollectionView : NSView, NSDraggingSource, NSDraggingDestination {
   @IBAction func selectAll(sender: AnyObject?)
   @IBAction func deselectAll(sender: AnyObject?)
   @available(OSX 10.11, *)
-  func register(itemClass: AnyClass?, forItemWithIdentifier identifier: String)
+  func register(itemClass: AnyClass?, forItemWith identifier: String)
   @available(OSX 10.11, *)
-  func register(nib: NSNib?, forItemWithIdentifier identifier: String)
+  func register(nib: NSNib?, forItemWith identifier: String)
   @available(OSX 10.11, *)
   func register(viewClass: AnyClass?, forSupplementaryViewOfKind kind: String, withIdentifier identifier: String)
   @available(OSX 10.11, *)
@@ -6194,7 +6194,7 @@ class NSDocument : Object, FilePresenter, NSUserInterfaceValidations {
   var windowControllers: [NSWindowController] { get }
   func shouldCloseWindowController(windowController: NSWindowController, delegate: AnyObject?, shouldClose shouldCloseSelector: Selector, contextInfo: UnsafeMutablePointer<Void>)
   @available(OSX 10.7, *)
-  func setDisplayName(displayNameOrNil: String?)
+  func setDisplay(displayNameOrNil: String?)
   var displayName: String { get }
   @available(OSX 10.8, *)
   func defaultDraftName() -> String
@@ -6283,7 +6283,7 @@ class NSDocumentController : Object, Coding, NSUserInterfaceValidations {
   func reviewUnsavedDocuments(alertTitle title: String?, cancellable: Bool, delegate: AnyObject?, didReviewAllSelector: Selector, contextInfo: UnsafeMutablePointer<Void>)
   func closeAllDocuments(delegate delegate: AnyObject?, didCloseAllSelector: Selector, contextInfo: UnsafeMutablePointer<Void>)
   @available(OSX 10.7, *)
-  func duplicateDocumentWithContentsOf(url: URL, copying duplicateByCopying: Bool, displayName displayNameOrNil: String?) throws -> NSDocument
+  func duplicateDocumentWithContentsOf(url: URL, copying duplicateByCopying: Bool, display displayNameOrNil: String?) throws -> NSDocument
   func presentError(error: Error, modalFor window: NSWindow, delegate: AnyObject?, didPresent didPresentSelector: Selector, contextInfo: UnsafeMutablePointer<Void>)
   func presentError(error: Error) -> Bool
   func willPresentError(error: Error) -> Error
@@ -7581,7 +7581,7 @@ class NSFontCollection : Object, Copying, MutableCopying, Coding {
   /*not inherited*/ init?(locale: Locale)
   class func show(collection: NSFontCollection, withName name: String, visibility: NSFontCollectionVisibility) throws
   class func hide(name name: String, visibility: NSFontCollectionVisibility) throws
-  class func renameFontCollection(name name: String, visibility: NSFontCollectionVisibility, toName name: String) throws
+  class func renameFontCollection(name name: String, visibility: NSFontCollectionVisibility, to name: String) throws
   class func allFontCollectionNames() -> [String]
   /*not inherited*/ init?(name: String)
   /*not inherited*/ init?(name: String, visibility: NSFontCollectionVisibility)
@@ -10458,7 +10458,7 @@ protocol NSPageControllerDelegate : ObjectProtocol {
   @available(OSX 10.8, *)
   optional func pageController(pageController: NSPageController, identifierFor object: AnyObject) -> String
   @available(OSX 10.8, *)
-  optional func pageController(pageController: NSPageController, viewControllerForIdentifier identifier: String) -> NSViewController
+  optional func pageController(pageController: NSPageController, viewControllerFor identifier: String) -> NSViewController
   @available(OSX 10.8, *)
   optional func pageController(pageController: NSPageController, frameFor object: AnyObject) -> Rect
   @available(OSX 10.8, *)
@@ -17893,12 +17893,12 @@ class NSWindow : NSResponder, NSAnimatablePropertyContainer, NSUserInterfaceVali
   func toggleFullScreen(sender: AnyObject?)
   var stringWithSavedFrame: String { get }
   func setFrameFrom(string: String)
-  func saveFrameUsingName(name: String)
-  func setFrameUsingName(name: String, force: Bool) -> Bool
-  func setFrameUsingName(name: String) -> Bool
+  func saveFrameUsing(name: String)
+  func setFrameUsing(name: String, force: Bool) -> Bool
+  func setFrameUsing(name: String) -> Bool
   func setFrameAutosaveName(name: String) -> Bool
   var frameAutosaveName: String { get }
-  class func removeFrameUsingName(name: String)
+  class func removeFrameUsing(name: String)
   func cacheImageIn(aRect: Rect)
   func restoreCachedImage()
   func discardCachedImage()
@@ -18737,7 +18737,7 @@ class NSWindowController : NSResponder, Coding, NSSeguePerforming {
   func setDocumentEdited(dirtyFlag: Bool)
   var shouldCloseDocument: Bool
   func synchronizeWindowTitleWithDocumentName()
-  func windowTitleForDocumentDisplayName(displayName: String) -> String
+  func windowTitleForDocumentDisplay(displayName: String) -> String
   @available(OSX 10.10, *)
   var contentViewController: NSViewController?
   var window: NSWindow?
diff --git a/Platforms/OSX/Automator.swift b/Platforms/OSX/Automator.swift
index 79ea690..49562b3 100644
--- a/Platforms/OSX/Automator.swift
+++ b/Platforms/OSX/Automator.swift
@@ -86,7 +86,7 @@ class AMWorkflow : Object, Copying {
   init()
   convenience init(contentsOf fileURL: URL) throws
   func writeTo(fileURL: URL) throws
-  func setValue(value: AnyObject?, forVariableWithName variableName: String) -> Bool
+  func setValue(value: AnyObject?, forVariableWith variableName: String) -> Bool
   func valueForVariable(name variableName: String) -> AnyObject
   func addAction(action: AMAction)
   func removeAction(action: AMAction)
diff --git a/Platforms/OSX/CloudKit.swift b/Platforms/OSX/CloudKit.swift
index 67fff9e..cf2d575 100644
--- a/Platforms/OSX/CloudKit.swift
+++ b/Platforms/OSX/CloudKit.swift
@@ -420,8 +420,8 @@ extension CLLocation : CKRecordValue {
 }
 @available(OSX 10.10, *)
 class CKRecordID : Object, SecureCoding, Copying {
-  convenience init(recordName: String)
-  init(recordName: String, zoneID: CKRecordZoneID)
+  convenience init(record recordName: String)
+  init(record recordName: String, zoneID: CKRecordZoneID)
   var recordName: String { get }
   var zoneID: CKRecordZoneID { get }
   @available(OSX 10.10, *)
diff --git a/Platforms/OSX/Contacts.swift b/Platforms/OSX/Contacts.swift
index e4433b9..87bffd1 100644
--- a/Platforms/OSX/Contacts.swift
+++ b/Platforms/OSX/Contacts.swift
@@ -602,7 +602,7 @@ extension CNContact {
    *
    * @discussion The name can contain any number of words.
    */
-  class func predicateForContactsMatchingName(name: String) -> Predicate
+  class func predicateForContactsMatching(name: String) -> Predicate
 
   /*! To fetch contacts matching contact identifiers. */
   class func predicateForContacts(identifiers identifiers: [String]) -> Predicate
@@ -1111,7 +1111,7 @@ class CNSaveRequest : Object {
    * @param contact The new contact to add.
    * @param identifier The container identifier to add the new contact to. Set to nil for the default container.
    */
-  func add(contact: CNMutableContact, toContainerWithIdentifier identifier: String?)
+  func add(contact: CNMutableContact, toContainerWith identifier: String?)
 
   /*!
    * @abstract Update an existing contact in the contact store.
@@ -1135,7 +1135,7 @@ class CNSaveRequest : Object {
    * @param group The new group to add.
    * @param identifier The container identifier to add the new group to. Set to nil for the default container.
    */
-  func add(group: CNMutableGroup, toContainerWithIdentifier identifier: String?)
+  func add(group: CNMutableGroup, toContainerWith identifier: String?)
 
   /*!
    * @abstract Update an existing group in the contact store.
diff --git a/Platforms/OSX/CoreData.swift b/Platforms/OSX/CoreData.swift
index 67fdc66..5b1170a 100644
--- a/Platforms/OSX/CoreData.swift
+++ b/Platforms/OSX/CoreData.swift
@@ -190,8 +190,8 @@ struct _requestFlags {
 }
 @available(OSX 10.4, *)
 class NSEntityDescription : Object, Coding, Copying, FastEnumeration {
-  class func entityForName(entityName: String, in context: NSManagedObjectContext) -> NSEntityDescription?
-  class func insertNewObjectForEntityForName(entityName: String, in context: NSManagedObjectContext) -> NSManagedObject
+  class func entityFor(entityName: String, in context: NSManagedObjectContext) -> NSEntityDescription?
+  class func insertNewObjectForEntityFor(entityName: String, in context: NSManagedObjectContext) -> NSManagedObject
   unowned(unsafe) var managedObjectModel: @sil_unmanaged NSManagedObjectModel { get }
   var managedObjectClassName: String!
   var name: String?
@@ -634,7 +634,7 @@ class NSManagedObjectModel : Object, Coding, Copying, FastEnumeration {
   func entitiesForConfiguration(configuration: String?) -> [NSEntityDescription]?
   func setEntities(entities: [NSEntityDescription], forConfiguration configuration: String)
   func setFetchRequestTemplate(fetchRequestTemplate: NSFetchRequest?, forName name: String)
-  func fetchRequestTemplateForName(name: String) -> NSFetchRequest?
+  func fetchRequestTemplateFor(name: String) -> NSFetchRequest?
   func fetchRequestFromTemplate(name name: String, substitutionVariables variables: [String : AnyObject]) -> NSFetchRequest?
   var localizationDictionary: [String : String]?
   @available(OSX 10.5, *)
diff --git a/Platforms/OSX/CoreImage.swift b/Platforms/OSX/CoreImage.swift
index e1a7216..0c83443 100644
--- a/Platforms/OSX/CoreImage.swift
+++ b/Platforms/OSX/CoreImage.swift
@@ -494,7 +494,7 @@ extension CIFilter {
    @param   attributes    Dictionary of the registration attributes of the filter. See below for attribute keys.
   */
   @available(OSX 10.4, *)
-  class func registerName(name: String, constructor anObject: CIFilterConstructor, classAttributes attributes: [String : AnyObject] = [:])
+  class func register(name: String, constructor anObject: CIFilterConstructor, classAttributes attributes: [String : AnyObject] = [:])
 
   /** Returns the localized name of a filter for display in the UI. */
   @available(OSX 10.4, *)
diff --git a/Platforms/OSX/DiscRecording.swift b/Platforms/OSX/DiscRecording.swift
index 70d4e54..47603dc 100644
--- a/Platforms/OSX/DiscRecording.swift
+++ b/Platforms/OSX/DiscRecording.swift
@@ -1236,18 +1236,38 @@ func DRFolderCopyChildren(folder: DRFolder!) -> Unmanaged<CFArray>!
 	@typedef DRFileRef
 	@abstract			The type of a reference to a DRFile object.
 */
+class DRFile {
+}
+
+/*!
+	@typedef DRFileRef
+	@abstract			The type of a reference to a DRFile object.
+*/
 typealias DRFileRef = DRFile
 
 /*!
 	@typedef DRFolderRef
 	@abstract			The type of a reference to a DRFolder object.
 */
+class DRFolder {
+}
+
+/*!
+	@typedef DRFolderRef
+	@abstract			The type of a reference to a DRFolder object.
+*/
 typealias DRFolderRef = DRFolder
 
 /*!
 	@typedef DRFSObjectRef
 	@abstract			A polymorphic type used for file and folder objects.
 */
+typealias DRFSObject = DRType
+
+/*!
+	@typedef DRFSObjectRef
+	@abstract			A polymorphic type used for file and folder objects.
+*/
 typealias DRFSObjectRef = DRFSObject
 
 /*!
@@ -2211,6 +2231,13 @@ func DRAudioTrackCreateWithURL(audioFileURL: CFURL!) -> Unmanaged<DRAudioTrack>!
 	@typedef DRBurnRef
 	A reference to DRBurn instances.
 */
+class DRBurn {
+}
+
+/*!
+	@typedef DRBurnRef
+	A reference to DRBurn instances.
+*/
 typealias DRBurnRef = DRBurn
 
 /*!
@@ -2687,6 +2714,13 @@ func DRCDTextBlockCreateArrayFromPackList(packs: CFData!) -> Unmanaged<CFArray>!
 	@typedef 	DRCDTextBlockRef
 	@abstract	A reference to DRCDTextBlock instances.
 */
+class DRCDTextBlock {
+}
+
+/*!
+	@typedef 	DRCDTextBlockRef
+	@abstract	A reference to DRCDTextBlock instances.
+*/
 typealias DRCDTextBlockRef = DRCDTextBlock
 
 /*!
@@ -3071,6 +3105,13 @@ let kDRCDTextSizeKey: CFString!
 	@typedef DRDeviceRef
 	This is the type of a reference to DRDevices.
 */
+class DRDevice {
+}
+
+/*!
+	@typedef DRDeviceRef
+	This is the type of a reference to DRDevices.
+*/
 typealias DRDeviceRef = DRDevice
 
 /*!
@@ -4279,6 +4320,13 @@ func DRDeviceXFactorForKPS(deviceOrMediaType: DRType!, _ kps: Float) -> Float
 	@typedef DREraseRef
 	This is the type of a reference to DRErases.
 */
+class DRErase {
+}
+
+/*!
+	@typedef DREraseRef
+	This is the type of a reference to DRErases.
+*/
 typealias DREraseRef = DRErase
 
 /*!
@@ -4530,6 +4578,13 @@ let kDRErrorStatusAdditionalSenseStringKey: CFString!
 	@typedef DRNotificationCenterRef
 	@abstract	The type of a reference to a DRNotificationCenter object.
 */
+class DRNotificationCenter {
+}
+
+/*!
+	@typedef DRNotificationCenterRef
+	@abstract	The type of a reference to a DRNotificationCenter object.
+*/
 typealias DRNotificationCenterRef = DRNotificationCenter
 
 /*!
@@ -4956,6 +5011,13 @@ let kDRStatusProgressCurrentXFactor: CFString!
 	@typedef DRTrackRef
 	A reference to a DRTrack object.
 */
+class DRTrack {
+}
+
+/*!
+	@typedef DRTrackRef
+	A reference to a DRTrack object.
+*/
 typealias DRTrackRef = DRTrack
 
 /*!
diff --git a/Platforms/OSX/Foundation.swift b/Platforms/OSX/Foundation.swift
index c5e9548..c5de447 100644
--- a/Platforms/OSX/Foundation.swift
+++ b/Platforms/OSX/Foundation.swift
@@ -3554,12 +3554,12 @@ typealias ItemProviderCompletionHandler = (SecureCoding?, Error!) -> Void
 typealias ItemProviderLoadHandler = (ItemProviderCompletionHandler!, AnyClass!, [Object : AnyObject]!) -> Void
 @available(OSX 10.10, *)
 class ItemProvider : Object, Copying {
-  init(item: SecureCoding?, typeIdentifier: String?)
+  init(item: SecureCoding?, type typeIdentifier: String?)
   convenience init?(contentsOf fileURL: URL!)
-  func registerItemForTypeIdentifier(typeIdentifier: String, loadHandler: ItemProviderLoadHandler)
+  func registerItemForType(typeIdentifier: String, loadHandler: ItemProviderLoadHandler)
   var registeredTypeIdentifiers: [AnyObject] { get }
-  func hasItemConformingToTypeIdentifier(typeIdentifier: String) -> Bool
-  func loadItemForTypeIdentifier(typeIdentifier: String, options: [Object : AnyObject]? = [:], completionHandler: ItemProviderCompletionHandler? = nil)
+  func hasItemConformingToType(typeIdentifier: String) -> Bool
+  func loadItemForType(typeIdentifier: String, options: [Object : AnyObject]? = [:], completionHandler: ItemProviderCompletionHandler? = nil)
   convenience init()
   @available(OSX 10.10, *)
   func copy(zone zone: Zone = nil) -> AnyObject
@@ -4829,7 +4829,7 @@ class NotificationCenter : Object {
   func removeObserver(observer: AnyObject)
   func removeObserver(observer: AnyObject, name aName: String?, object anObject: AnyObject?)
   @available(OSX 10.6, *)
-  func addObserverForName(name: String?, object obj: AnyObject?, queue: OperationQueue?, usingBlock block: (Notification) -> Void) -> ObjectProtocol
+  func addObserverFor(name: String?, object obj: AnyObject?, queue: OperationQueue?, usingBlock block: (Notification) -> Void) -> ObjectProtocol
   init()
 }
 enum PostingStyle : UInt {
@@ -6239,7 +6239,7 @@ class ScriptCommand : Object, Coding {
   func encode(coder aCoder: Coder)
 }
 class ScriptCommandDescription : Object, Coding {
-  init?(suiteName: String, commandName: String, dictionary commandDeclaration: [Object : AnyObject]?)
+  init?(suiteName: String, command commandName: String, dictionary commandDeclaration: [Object : AnyObject]?)
   init?(coder inCoder: Coder)
   var suiteName: String { get }
   var commandName: String { get }
@@ -10444,7 +10444,7 @@ class URLResponse : Object, SecureCoding, Copying {
       @result The initialized NSURLResponse.
       @discussion This is the designated initializer for NSURLResponse.
   */
-  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncodingName name: String?)
+  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncoding name: String?)
 
   /*! 
       @method URL
@@ -10576,7 +10576,7 @@ class HTTPURLResponse : URLResponse {
       @result The initialized NSURLResponse.
       @discussion This is the designated initializer for NSURLResponse.
   */
-  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncodingName name: String?)
+  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncoding name: String?)
   convenience init()
   init?(coder aDecoder: Coder)
 }
@@ -10774,12 +10774,12 @@ class UserDefaults : Object {
   func removeSuiteNamed(suiteName: String)
   func dictionaryRepresentation() -> [String : AnyObject]
   var volatileDomainNames: [String] { get }
-  func volatileDomainForName(domainName: String) -> [String : AnyObject]
+  func volatileDomainFor(domainName: String) -> [String : AnyObject]
   func setVolatileDomain(domain: [String : AnyObject], forName domainName: String)
-  func removeVolatileDomainForName(domainName: String)
-  func persistentDomainForName(domainName: String) -> [String : AnyObject]?
+  func removeVolatileDomainFor(domainName: String)
+  func persistentDomainFor(domainName: String) -> [String : AnyObject]?
   func setPersistentDomain(domain: [String : AnyObject], forName domainName: String)
-  func removePersistentDomainForName(domainName: String)
+  func removePersistentDomainFor(domainName: String)
   func synchronize() -> Bool
   func objectIsForcedForKey(key: String) -> Bool
   func objectIsForcedForKey(key: String, inDomain domain: String) -> Bool
@@ -11052,25 +11052,25 @@ class XMLDTD : XMLNode {
       @method entityDeclarationForName:
       @abstract Returns the entity declaration matching this name.
   */
-  func entityDeclarationForName(name: String) -> XMLDTDNode?
+  func entityDeclarationFor(name: String) -> XMLDTDNode?
 
   /*!
       @method notationDeclarationForName:
       @abstract Returns the notation declaration matching this name.
   */
-  func notationDeclarationForName(name: String) -> XMLDTDNode?
+  func notationDeclarationFor(name: String) -> XMLDTDNode?
 
   /*!
       @method elementDeclarationForName:
       @abstract Returns the element declaration matching this name.
   */
-  func elementDeclarationForName(name: String) -> XMLDTDNode?
+  func elementDeclarationFor(name: String) -> XMLDTDNode?
 
   /*!
       @method attributeDeclarationForName:
       @abstract Returns the attribute declaration matching this name.
   */
-  func attributeDeclarationForName(name: String, elementName: String) -> XMLDTDNode?
+  func attributeDeclarationFor(name: String, elementName: String) -> XMLDTDNode?
 
   /*!
       @method predefinedEntityDeclarationForName:
@@ -11078,7 +11078,7 @@ class XMLDTD : XMLNode {
   	@discussion The five predefined entities are
   	<ul><li>&amp;lt; - &lt;</li><li>&amp;gt; - &gt;</li><li>&amp;amp; - &amp;</li><li>&amp;quot; - &quot;</li><li>&amp;apos; - &amp;</li></ul>
   */
-  class func predefinedEntityDeclarationForName(name: String) -> XMLDTDNode?
+  class func predefinedEntityDeclarationFor(name: String) -> XMLDTDNode?
 
   /*!
       @method initWithKind:
@@ -11386,7 +11386,7 @@ class XMLElement : XMLNode {
       @method elementsForName:
       @abstract Returns all of the child elements that match this name.
   */
-  func elementsForName(name: String) -> [XMLElement]
+  func elementsFor(name: String) -> [XMLElement]
 
   /*!
       @method elementsForLocalName:URI
@@ -11404,7 +11404,7 @@ class XMLElement : XMLNode {
       @method removeAttributeForName:
       @abstract Removes an attribute based on its name.
   */
-  func removeAttributeForName(name: String)
+  func removeAttributeFor(name: String)
 
   /*!
       @method setAttributes
@@ -11422,7 +11422,7 @@ class XMLElement : XMLNode {
       @method attributeForName:
       @abstract Returns an attribute matching this name.
   */
-  func attributeForName(name: String) -> XMLNode?
+  func attributeFor(name: String) -> XMLNode?
 
   /*!
       @method attributeForLocalName:URI:
@@ -11458,7 +11458,7 @@ class XMLElement : XMLNode {
       @method resolveNamespaceForName:
       @abstract Returns the namespace who matches the prefix of the name given. Looks in the entire namespace chain.
   */
-  func resolveNamespaceForName(name: String) -> XMLNode?
+  func resolveNamespaceFor(name: String) -> XMLNode?
 
   /*!
       @method resolvePrefixForNamespaceURI:
@@ -11774,13 +11774,13 @@ class XMLNode : Object, Copying {
       @method localNameForName:
       @abstract Returns the local name bar in foo:bar.
   */
-  class func localNameForName(name: String) -> String
+  class func localNameFor(name: String) -> String
 
   /*!
       @method localNameForName:
       @abstract Returns the prefix foo in the name foo:bar.
   */
-  class func prefixForName(name: String) -> String?
+  class func prefixFor(name: String) -> String?
 
   /*!
       @method predefinedNamespaceForPrefix:
@@ -11892,12 +11892,12 @@ extension XMLParser {
 protocol XMLParserDelegate : ObjectProtocol {
   optional func parserDidStartDocument(parser: XMLParser)
   optional func parserDidEndDocument(parser: XMLParser)
-  optional func parser(parser: XMLParser, foundNotationDeclarationWithName name: String, publicID: String?, systemID: String?)
-  optional func parser(parser: XMLParser, foundUnparsedEntityDeclarationWithName name: String, publicID: String?, systemID: String?, notationName: String?)
-  optional func parser(parser: XMLParser, foundAttributeDeclarationWithName attributeName: String, forElement elementName: String, type: String?, defaultValue: String?)
-  optional func parser(parser: XMLParser, foundElementDeclarationWithName elementName: String, model: String)
-  optional func parser(parser: XMLParser, foundInternalEntityDeclarationWithName name: String, value: String?)
-  optional func parser(parser: XMLParser, foundExternalEntityDeclarationWithName name: String, publicID: String?, systemID: String?)
+  optional func parser(parser: XMLParser, foundNotationDeclarationWith name: String, publicID: String?, systemID: String?)
+  optional func parser(parser: XMLParser, foundUnparsedEntityDeclarationWith name: String, publicID: String?, systemID: String?, notationName: String?)
+  optional func parser(parser: XMLParser, foundAttributeDeclarationWith attributeName: String, forElement elementName: String, type: String?, defaultValue: String?)
+  optional func parser(parser: XMLParser, foundElementDeclarationWith elementName: String, model: String)
+  optional func parser(parser: XMLParser, foundInternalEntityDeclarationWith name: String, value: String?)
+  optional func parser(parser: XMLParser, foundExternalEntityDeclarationWith name: String, publicID: String?, systemID: String?)
   optional func parser(parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String] = [:])
   optional func parser(parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?)
   optional func parser(parser: XMLParser, didStartMappingPrefix prefix: String, toURI namespaceURI: String)
diff --git a/Platforms/OSX/GameKit.swift b/Platforms/OSX/GameKit.swift
index faa4880..afe6d77 100644
--- a/Platforms/OSX/GameKit.swift
+++ b/Platforms/OSX/GameKit.swift
@@ -588,7 +588,7 @@ class GKNotificationBanner : Object {
 }
 @available(OSX 10.8, *)
 class GKPlayer : Object {
-  class func loadPlayersForIdentifiers(identifiers: [String], withCompletionHandler completionHandler: (([GKPlayer]?, Error?) -> Void)? = nil)
+  class func loadPlayersFor(identifiers: [String], withCompletionHandler completionHandler: (([GKPlayer]?, Error?) -> Void)? = nil)
   var playerID: String? { get }
   @available(OSX 10.8, *)
   var displayName: String? { get }
@@ -729,7 +729,7 @@ extension GKScore {
 @available(OSX, introduced=10.8, deprecated=10.10, message="Use MCSession from the MultipeerConnectivity framework instead")
 class GKSession : Object {
   @available(OSX, introduced=10.8, deprecated=10.10)
-  init!(sessionID: String!, displayName name: String!, sessionMode mode: GKSessionMode)
+  init!(sessionID: String!, display name: String!, sessionMode mode: GKSessionMode)
   unowned(unsafe) var delegate: @sil_unmanaged GKSessionDelegate!
   var sessionID: String! { get }
   var displayName: String! { get }
diff --git a/Platforms/OSX/IOBluetooth.swift b/Platforms/OSX/IOBluetooth.swift
index ea1c400..7dd1fd8 100644
--- a/Platforms/OSX/IOBluetooth.swift
+++ b/Platforms/OSX/IOBluetooth.swift
@@ -2869,14 +2869,30 @@ var kBluetoothLMPVersionCoreSpecification2_1EDR: BluetoothLMPVersions { get }
 var kBluetoothLMPVersionCoreSpecification3_0HS: BluetoothLMPVersions { get }
 var kBluetoothLMPVersionCoreSpecification4_0: BluetoothLMPVersions { get }
 var kBluetoothLMPVersionCoreSpecification4_1: BluetoothLMPVersions { get }
+class IOBluetoothObject {
+}
 typealias IOBluetoothObjectRef = IOBluetoothObject
+class IOBluetoothDevice {
+}
 typealias IOBluetoothDeviceRef = IOBluetoothDevice
 typealias IOBluetoothL2CAPChannelRef = IOBluetoothL2CAPChannel
+class IOBluetoothL2CAPChannel {
+}
+class IOBluetoothRFCOMMChannel {
+}
 typealias IOBluetoothRFCOMMChannelRef = IOBluetoothRFCOMMChannel
+class IOBluetoothSDPServiceRecord {
+}
 typealias IOBluetoothSDPServiceRecordRef = IOBluetoothSDPServiceRecord
+class IOBluetoothSDPUUID {
+}
 typealias IOBluetoothSDPUUIDRef = IOBluetoothSDPUUID
+class IOBluetoothSDPDataElement {
+}
 typealias IOBluetoothSDPDataElementRef = IOBluetoothSDPDataElement
 typealias IOBluetoothUserNotificationRef = IOBluetoothUserNotification
+class IOBluetoothUserNotification {
+}
 typealias IOBluetoothObjectID = UInt
 
 /*!	@typedef	IOBluetoothDeviceSearchOptions
diff --git a/Platforms/OSX/IOBluetoothUI.swift b/Platforms/OSX/IOBluetoothUI.swift
index f2748ab..1aa6b6e 100644
--- a/Platforms/OSX/IOBluetoothUI.swift
+++ b/Platforms/OSX/IOBluetoothUI.swift
@@ -1,7 +1,13 @@
 
+class IOBluetoothDeviceSelectorController {
+}
 typealias IOBluetoothDeviceSelectorControllerRef = IOBluetoothDeviceSelectorController
+class IOBluetoothPairingController {
+}
 typealias IOBluetoothPairingControllerRef = IOBluetoothPairingController
 typealias IOBluetoothServiceBrowserControllerRef = IOBluetoothServiceBrowserController
+class IOBluetoothServiceBrowserController {
+}
 
 /*!
   @enum IOBluetoothServiceBrowserControllerOptions
diff --git a/Platforms/OSX/MapKit.swift b/Platforms/OSX/MapKit.swift
index 351c115..4284fdd 100644
--- a/Platforms/OSX/MapKit.swift
+++ b/Platforms/OSX/MapKit.swift
@@ -17,7 +17,7 @@ enum MKAnnotationViewDragState : UInt {
 }
 @available(OSX 10.9, *)
 class MKAnnotationView : NSView {
-  init(annotation: MKAnnotation?, reuseIdentifier: String?)
+  init(annotation: MKAnnotation?, reuse reuseIdentifier: String?)
   var reuseIdentifier: String? { get }
   func prepareForReuse()
   var annotation: MKAnnotation?
@@ -568,7 +568,7 @@ class MKPinAnnotationView : MKAnnotationView {
   var animatesDrop: Bool
   @available(OSX, introduced=10.9, deprecated=10.11, message="Use pinTintColor instead")
   var pinColor: MKPinAnnotationColor
-  init(annotation: MKAnnotation?, reuseIdentifier: String?)
+  init(annotation: MKAnnotation?, reuse reuseIdentifier: String?)
   init(frame frameRect: Rect)
   init?(coder: Coder)
   convenience init()
diff --git a/Platforms/OSX/MediaLibrary.swift b/Platforms/OSX/MediaLibrary.swift
index 420f877..64fa6fe 100644
--- a/Platforms/OSX/MediaLibrary.swift
+++ b/Platforms/OSX/MediaLibrary.swift
@@ -57,10 +57,10 @@ class MLMediaSource : Object {
   var mediaSourceIdentifier: String { get }
   var attributes: [String : AnyObject] { get }
   var rootMediaGroup: MLMediaGroup? { get }
-  func mediaGroupForIdentifier(mediaGroupIdentifier: String) -> MLMediaGroup?
-  func mediaGroupsForIdentifiers(mediaGroupIdentifiers: [String]) -> [String : MLMediaGroup]
-  func mediaObjectForIdentifier(mediaObjectIdentifier: String) -> MLMediaObject?
-  func mediaObjectsForIdentifiers(mediaObjectIdentifiers: [String]) -> [String : MLMediaObject]
+  func mediaGroupFor(mediaGroupIdentifier: String) -> MLMediaGroup?
+  func mediaGroupsFor(mediaGroupIdentifiers: [String]) -> [String : MLMediaGroup]
+  func mediaObjectFor(mediaObjectIdentifier: String) -> MLMediaObject?
+  func mediaObjectsFor(mediaObjectIdentifiers: [String]) -> [String : MLMediaObject]
   init()
 }
 struct MLMediaSourceType : OptionSetType {
diff --git a/Platforms/OSX/Metal.swift b/Platforms/OSX/Metal.swift
index 000fb2f..eaa092e 100644
--- a/Platforms/OSX/Metal.swift
+++ b/Platforms/OSX/Metal.swift
@@ -111,7 +111,7 @@ class MTLStructMember : Object {
 @available(OSX 10.11, *)
 class MTLStructType : Object {
   var members: [MTLStructMember] { get }
-  func memberByName(name: String) -> MTLStructMember?
+  func memberBy(name: String) -> MTLStructMember?
   init()
 }
 @available(OSX 10.11, *)
diff --git a/Platforms/OSX/MultipeerConnectivity.swift b/Platforms/OSX/MultipeerConnectivity.swift
index 76edaa6..e86257a 100644
--- a/Platforms/OSX/MultipeerConnectivity.swift
+++ b/Platforms/OSX/MultipeerConnectivity.swift
@@ -255,7 +255,7 @@ protocol MCNearbyServiceBrowserDelegate : ObjectProtocol {
  */
 @available(OSX 10.10, *)
 class MCPeerID : Object, Copying, SecureCoding {
-  init(displayName myDisplayName: String)
+  init(display myDisplayName: String)
   var displayName: String { get }
   convenience init()
   @available(OSX 10.10, *)
@@ -358,9 +358,9 @@ protocol MCSessionDelegate : ObjectProtocol {
   @available(OSX 10.10, *)
   func session(session: MCSession, didReceive stream: InputStream, withName streamName: String, fromPeer peerID: MCPeerID)
   @available(OSX 10.10, *)
-  func session(session: MCSession, didStartReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, withProgress progress: Progress)
+  func session(session: MCSession, didStartReceivingResourceWith resourceName: String, fromPeer peerID: MCPeerID, withProgress progress: Progress)
   @available(OSX 10.10, *)
-  func session(session: MCSession, didFinishReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL, withError error: Error?)
+  func session(session: MCSession, didFinishReceivingResourceWith resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL, withError error: Error?)
   @available(OSX 10.10, *)
   optional func session(session: MCSession, didReceiveCertificate certificate: [AnyObject]?, fromPeer peerID: MCPeerID, certificateHandler: (Bool) -> Void)
 }
diff --git a/Platforms/OSX/NetworkExtension.swift b/Platforms/OSX/NetworkExtension.swift
index 6b77d31..5b73446 100644
--- a/Platforms/OSX/NetworkExtension.swift
+++ b/Platforms/OSX/NetworkExtension.swift
@@ -264,7 +264,7 @@ class NEAppRule : Object, SecureCoding, Copying {
    * @param designatedRequirement The designated requirement of the executable that matches the rule.
    */
   @available(OSX 10.11, *)
-  init(signingIdentifier: String, designatedRequirement: String)
+  init(signing signingIdentifier: String, designatedRequirement: String)
 
   /*!
    * @property matchSigningIdentifier
diff --git a/Platforms/OSX/OpenDirectory.swift b/Platforms/OSX/OpenDirectory.swift
index 1316681..da6da5a 100644
--- a/Platforms/OSX/OpenDirectory.swift
+++ b/Platforms/OSX/OpenDirectory.swift
@@ -19,24 +19,52 @@ typealias ODContextRef = ODContext
     @typedef    ODNodeRef
     @abstract   Opaque reference for the ODNode object
 */
+class ODNode {
+}
+
+/*!
+    @typedef    ODNodeRef
+    @abstract   Opaque reference for the ODNode object
+*/
 typealias ODNodeRef = ODNode
 
 /*!
     @typedef    ODQueryRef
     @abstract   Opaque reference for the ODQuery object
 */
+class ODQuery {
+}
+
+/*!
+    @typedef    ODQueryRef
+    @abstract   Opaque reference for the ODQuery object
+*/
 typealias ODQueryRef = ODQuery
 
 /*!
     @typedef    ODRecordRef
     @abstract   Opaque reference for the ODRecord object
 */
+class ODRecord {
+}
+
+/*!
+    @typedef    ODRecordRef
+    @abstract   Opaque reference for the ODRecord object
+*/
 typealias ODRecordRef = ODRecord
 
 /*!
     @typedef	ODSessionRef
     @abstract   Opaque reference for ODSession object
 */
+class ODSession {
+}
+
+/*!
+    @typedef	ODSessionRef
+    @abstract   Opaque reference for ODSession object
+*/
 typealias ODSessionRef = ODSession
 
 /*!
@@ -5235,7 +5263,7 @@ class ODNode : Object {
                   details are not needed.
   */
   @available(OSX 10.6, *)
-  func setCredentials(recordType inRecordType: String!, recordName inRecordName: String!, password inPassword: String!) throws
+  func setCredentials(recordType inRecordType: String!, record inRecordName: String!, password inPassword: String!) throws
 
   /*!
       @method     setCredentialsWithRecordType:authType:authItems:outAuthItems:context:error:
@@ -5437,7 +5465,7 @@ class ODNode : Object {
       @result     a bool which signifies if the password passes all content policies, otherwise error is set.
    */
   @available(OSX 10.10, *)
-  func passwordContentCheck(password: String!, forRecordName recordName: String!) throws
+  func passwordContentCheck(password: String!, forRecord recordName: String!) throws
   init()
 }
 
diff --git a/Platforms/OSX/ScreenSaver.swift b/Platforms/OSX/ScreenSaver.swift
index 0197f65..80c9ece 100644
--- a/Platforms/OSX/ScreenSaver.swift
+++ b/Platforms/OSX/ScreenSaver.swift
@@ -1,6 +1,6 @@
 
 class ScreenSaverDefaults : UserDefaults {
-  convenience init?(forModuleWithName inModuleName: String)
+  convenience init?(forModuleWith inModuleName: String)
   convenience init()
   @available(OSX 10.9, *)
   init?(suiteName suitename: String?)
diff --git a/Platforms/OSX/SpriteKit.swift b/Platforms/OSX/SpriteKit.swift
index 40cb9f4..1b8c354 100644
--- a/Platforms/OSX/SpriteKit.swift
+++ b/Platforms/OSX/SpriteKit.swift
@@ -489,7 +489,7 @@ extension SKAction {
    @param name the name of a child object
    @see SKNode.name
    */
-  class func run(action: SKAction, onChildWithName name: String) -> SKAction
+  class func run(action: SKAction, onChildWith name: String) -> SKAction
 
   /** Creates an action that executes a block over a duration
    @param duration The duration of the animation
diff --git a/Platforms/OSX/WebKit.swift b/Platforms/OSX/WebKit.swift
index d12c229..fb8f8a2 100644
--- a/Platforms/OSX/WebKit.swift
+++ b/Platforms/OSX/WebKit.swift
@@ -782,7 +782,7 @@ class DOMDocument : DOMNode {
   func queryCommandSupported(command: String!) -> Bool
   @available(OSX 10.5, *)
   func queryCommandValue(command: String!) -> String!
-  func getElementsByName(elementName: String!) -> DOMNodeList!
+  func getElementsBy(elementName: String!) -> DOMNodeList!
   @available(OSX 10.5, *)
   func elementFromPoint(x: Int32, y: Int32) -> DOMElement!
   @available(OSX 10.5, *)
@@ -799,7 +799,7 @@ class DOMDocument : DOMNode {
   func hasFocus() -> Bool
   @available(OSX 10.6, *)
   func webkitCancelFullScreen()
-  func getElementById(elementId: String!) -> DOMElement!
+  func getElementBy(elementId: String!) -> DOMElement!
   @available(OSX 10.6, *)
   func querySelector(selectors: String!) -> DOMElement!
   @available(OSX 10.6, *)
@@ -2632,7 +2632,7 @@ class WKUserContentController : Object {
   /*! @abstract Removes a script message handler.
    @param name The name of the message handler to remove.
    */
-  func removeScriptMessageHandlerForName(name: String)
+  func removeScriptMessageHandlerFor(name: String)
   init()
 }
 
@@ -2728,7 +2728,7 @@ class WKWebView : NSView {
    @result A new navigation.
    */
   @available(OSX 10.11, *)
-  func load(data: Data, mimeType MIMEType: String, characterEncodingName: String, baseURL: URL) -> WKNavigation?
+  func load(data: Data, mimeType MIMEType: String, characterEncoding characterEncodingName: String, baseURL: URL) -> WKNavigation?
 
   /*! @abstract Navigates to an item from the back-forward list and sets it
    as the current item.
@@ -3786,7 +3786,7 @@ class WebFrame : Object {
       @param encodingName The encoding of the data.
       @param URL The base URL to apply to relative URLs within the document.
   */
-  func load(data: Data!, mimeType MIMEType: String!, textEncodingName encodingName: String!, baseURL URL: URL!)
+  func load(data: Data!, mimeType MIMEType: String!, textEncoding encodingName: String!, baseURL URL: URL!)
 
   /*!
       @method loadHTMLString:baseURL:
@@ -4726,7 +4726,7 @@ protocol WebPolicyDelegate : ObjectProtocol {
       in its action. This is to avoid possible confusion about the modifiers.
   */
   @available(OSX 10.0, *)
-  optional func webView(webView: WebView!, decidePolicyForNewWindowAction actionInformation: [Object : AnyObject]!, request: URLRequest!, newFrameName frameName: String!, decisionListener listener: WebPolicyDecisionListener!)
+  optional func webView(webView: WebView!, decidePolicyForNewWindowAction actionInformation: [Object : AnyObject]!, request: URLRequest!, newFrame frameName: String!, decisionListener listener: WebPolicyDecisionListener!)
 
   /*!
       @method webView:decidePolicyForMIMEType:request:frame:
@@ -5006,7 +5006,7 @@ class WebResource : Object, Coding, Copying {
       @param frameName The frame name of the resource if the resource represents the contents of an entire HTML frame (can be nil).
       @result An initialized WebResource.
   */
-  init!(data: Data!, url URL: URL!, mimeType MIMEType: String!, textEncodingName: String!, frameName: String!)
+  init!(data: Data!, url URL: URL!, mimeType MIMEType: String!, textEncoding textEncodingName: String!, frame frameName: String!)
 
   /*!
       @property data
@@ -6058,7 +6058,7 @@ class WebView : NSView {
       @param groupName The name of the webView set to which this webView will be added.  May be nil.
       @result Returns an initialized WebView.
   */
-  init!(frame: Rect, frameName: String!, groupName: String!)
+  init!(frame: Rect, frame frameName: String!, groupName: String!)
 
   /*!
       @method close
diff --git a/Platforms/iOS/AVFoundation.swift b/Platforms/iOS/AVFoundation.swift
index 05b4748..d86cefd 100644
--- a/Platforms/iOS/AVFoundation.swift
+++ b/Platforms/iOS/AVFoundation.swift
@@ -15610,7 +15610,7 @@ extension AVMetadataItem {
   	@result			An instance of NSArray containing the metadata items of the target NSArray that match the specified identifier.
   */
   @available(iOS 8.0, *)
-  class func metadataItemsFrom(metadataItems: [AVMetadataItem], filteredByIdentifier identifier: String) -> [AVMetadataItem]
+  class func metadataItemsFrom(metadataItems: [AVMetadataItem], filteredBy identifier: String) -> [AVMetadataItem]
 
   /*!
   	@method			metadataItemsFromArray:filteredByMetadataItemFilter:
@@ -15642,9 +15642,9 @@ extension AVMetadataItem {
   @available(iOS 8.0, *)
   class func identifierForKey(key: AnyObject, keySpace: String) -> String?
   @available(iOS 8.0, *)
-  class func keySpaceForIdentifier(identifier: String) -> String?
+  class func keySpaceFor(identifier: String) -> String?
   @available(iOS 8.0, *)
-  class func keyForIdentifier(identifier: String) -> AnyObject?
+  class func keyFor(identifier: String) -> AnyObject?
   @NSCopying var key: protocol<Copying, ObjectProtocol>? { get }
   var commonKey: String? { get }
   var keySpace: String? { get }
diff --git a/Platforms/iOS/Accounts.swift b/Platforms/iOS/Accounts.swift
index 7ed3ffd..c62d8c1 100644
--- a/Platforms/iOS/Accounts.swift
+++ b/Platforms/iOS/Accounts.swift
@@ -33,7 +33,7 @@ typealias ACAccountStoreCredentialRenewalHandler = (ACAccountCredentialRenewResu
 class ACAccountStore : Object {
   var accounts: [AnyObject]! { get }
   func account(identifier identifier: String!) -> ACAccount!
-  func accountType(accountTypeIdentifier typeIdentifier: String!) -> ACAccountType!
+  func accountType(accountType typeIdentifier: String!) -> ACAccountType!
   func accounts(accountType accountType: ACAccountType!) -> [AnyObject]!
   func saveAccount(account: ACAccount!, withCompletionHandler completionHandler: ACAccountStoreSaveCompletionHandler!)
   func requestAccessToAccounts(type accountType: ACAccountType!, options: [Object : AnyObject]! = [:], completion: ACAccountStoreRequestAccessCompletionHandler!)
diff --git a/Platforms/iOS/CloudKit.swift b/Platforms/iOS/CloudKit.swift
index 1dfc71f..52189a0 100644
--- a/Platforms/iOS/CloudKit.swift
+++ b/Platforms/iOS/CloudKit.swift
@@ -420,8 +420,8 @@ extension CLLocation : CKRecordValue {
 }
 @available(iOS 8.0, *)
 class CKRecordID : Object, SecureCoding, Copying {
-  convenience init(recordName: String)
-  init(recordName: String, zoneID: CKRecordZoneID)
+  convenience init(record recordName: String)
+  init(record recordName: String, zoneID: CKRecordZoneID)
   var recordName: String { get }
   var zoneID: CKRecordZoneID { get }
   @available(iOS 8.0, *)
diff --git a/Platforms/iOS/Contacts.swift b/Platforms/iOS/Contacts.swift
index f47d75b..b1c5fb4 100644
--- a/Platforms/iOS/Contacts.swift
+++ b/Platforms/iOS/Contacts.swift
@@ -594,7 +594,7 @@ extension CNContact {
    *
    * @discussion The name can contain any number of words.
    */
-  class func predicateForContactsMatchingName(name: String) -> Predicate
+  class func predicateForContactsMatching(name: String) -> Predicate
 
   /*! To fetch contacts matching contact identifiers. */
   class func predicateForContacts(identifiers identifiers: [String]) -> Predicate
@@ -1101,7 +1101,7 @@ class CNSaveRequest : Object {
    * @param contact The new contact to add.
    * @param identifier The container identifier to add the new contact to. Set to nil for the default container.
    */
-  func add(contact: CNMutableContact, toContainerWithIdentifier identifier: String?)
+  func add(contact: CNMutableContact, toContainerWith identifier: String?)
 
   /*!
    * @abstract Update an existing contact in the contact store.
@@ -1125,7 +1125,7 @@ class CNSaveRequest : Object {
    * @param group The new group to add.
    * @param identifier The container identifier to add the new group to. Set to nil for the default container.
    */
-  func add(group: CNMutableGroup, toContainerWithIdentifier identifier: String?)
+  func add(group: CNMutableGroup, toContainerWith identifier: String?)
 
   /*!
    * @abstract Update an existing group in the contact store.
diff --git a/Platforms/iOS/CoreData.swift b/Platforms/iOS/CoreData.swift
index 694b32f..a182ccb 100644
--- a/Platforms/iOS/CoreData.swift
+++ b/Platforms/iOS/CoreData.swift
@@ -190,8 +190,8 @@ struct _requestFlags {
 }
 @available(iOS 3.0, *)
 class NSEntityDescription : Object, Coding, Copying, FastEnumeration {
-  class func entityForName(entityName: String, in context: NSManagedObjectContext) -> NSEntityDescription?
-  class func insertNewObjectForEntityForName(entityName: String, in context: NSManagedObjectContext) -> NSManagedObject
+  class func entityFor(entityName: String, in context: NSManagedObjectContext) -> NSEntityDescription?
+  class func insertNewObjectForEntityFor(entityName: String, in context: NSManagedObjectContext) -> NSManagedObject
   unowned(unsafe) var managedObjectModel: @sil_unmanaged NSManagedObjectModel { get }
   var managedObjectClassName: String!
   var name: String?
@@ -694,7 +694,7 @@ class NSManagedObjectModel : Object, Coding, Copying, FastEnumeration {
   func entitiesForConfiguration(configuration: String?) -> [NSEntityDescription]?
   func setEntities(entities: [NSEntityDescription], forConfiguration configuration: String)
   func setFetchRequestTemplate(fetchRequestTemplate: NSFetchRequest?, forName name: String)
-  func fetchRequestTemplateForName(name: String) -> NSFetchRequest?
+  func fetchRequestTemplateFor(name: String) -> NSFetchRequest?
   func fetchRequestFromTemplate(name name: String, substitutionVariables variables: [String : AnyObject]) -> NSFetchRequest?
   var localizationDictionary: [String : String]?
   @available(iOS 3.0, *)
diff --git a/Platforms/iOS/CoreImage.swift b/Platforms/iOS/CoreImage.swift
index 7e0a21f..fc077b0 100644
--- a/Platforms/iOS/CoreImage.swift
+++ b/Platforms/iOS/CoreImage.swift
@@ -465,7 +465,7 @@ extension CIFilter {
    @param   attributes    Dictionary of the registration attributes of the filter. See below for attribute keys.
   */
   @available(iOS 9.0, *)
-  class func registerName(name: String, constructor anObject: CIFilterConstructor, classAttributes attributes: [String : AnyObject] = [:])
+  class func register(name: String, constructor anObject: CIFilterConstructor, classAttributes attributes: [String : AnyObject] = [:])
 
   /** Returns the localized name of a filter for display in the UI. */
   @available(iOS 9.0, *)
diff --git a/Platforms/iOS/CoreSpotlight.swift b/Platforms/iOS/CoreSpotlight.swift
index 195c6dd..a6ca208 100644
--- a/Platforms/iOS/CoreSpotlight.swift
+++ b/Platforms/iOS/CoreSpotlight.swift
@@ -11,7 +11,7 @@ class CSIndexExtensionRequestHandler : Object, ExtensionRequestHandling, CSSearc
   @available(iOS 9.0, *)
   func searchableIndex(searchableIndex: CSSearchableIndex, reindexAllSearchableItemsWithAcknowledgementHandler acknowledgementHandler: () -> Void)
   @available(iOS 9.0, *)
-  func searchableIndex(searchableIndex: CSSearchableIndex, reindexSearchableItemsWithIdentifiers identifiers: [String], acknowledgementHandler: () -> Void)
+  func searchableIndex(searchableIndex: CSSearchableIndex, reindexSearchableItemsWith identifiers: [String], acknowledgementHandler: () -> Void)
   @available(iOS 9.0, *)
   func searchableIndexDidThrottle(searchableIndex: CSSearchableIndex)
   @available(iOS 9.0, *)
@@ -19,7 +19,7 @@ class CSIndexExtensionRequestHandler : Object, ExtensionRequestHandling, CSSearc
 }
 @available(iOS 9.0, *)
 class CSPerson : Object, SecureCoding, Copying {
-  init(displayName: String?, handles: [String], handleIdentifier: String)
+  init(display displayName: String?, handles: [String], handle handleIdentifier: String)
   var displayName: String? { get }
   var handles: [String] { get }
   var handleIdentifier: String { get }
@@ -68,7 +68,7 @@ extension CSSearchableIndex {
 @available(iOS 9.0, *)
 protocol CSSearchableIndexDelegate : ObjectProtocol {
   func searchableIndex(searchableIndex: CSSearchableIndex, reindexAllSearchableItemsWithAcknowledgementHandler acknowledgementHandler: () -> Void)
-  func searchableIndex(searchableIndex: CSSearchableIndex, reindexSearchableItemsWithIdentifiers identifiers: [String], acknowledgementHandler: () -> Void)
+  func searchableIndex(searchableIndex: CSSearchableIndex, reindexSearchableItemsWith identifiers: [String], acknowledgementHandler: () -> Void)
   optional func searchableIndexDidThrottle(searchableIndex: CSSearchableIndex)
   optional func searchableIndexDidFinishThrottle(searchableIndex: CSSearchableIndex)
 }
diff --git a/Platforms/iOS/Foundation.swift b/Platforms/iOS/Foundation.swift
index e5e95df..407e669 100644
--- a/Platforms/iOS/Foundation.swift
+++ b/Platforms/iOS/Foundation.swift
@@ -3074,12 +3074,12 @@ typealias ItemProviderCompletionHandler = (SecureCoding?, Error!) -> Void
 typealias ItemProviderLoadHandler = (ItemProviderCompletionHandler!, AnyClass!, [Object : AnyObject]!) -> Void
 @available(iOS 8.0, *)
 class ItemProvider : Object, Copying {
-  init(item: SecureCoding?, typeIdentifier: String?)
+  init(item: SecureCoding?, type typeIdentifier: String?)
   convenience init?(contentsOf fileURL: URL!)
-  func registerItemForTypeIdentifier(typeIdentifier: String, loadHandler: ItemProviderLoadHandler)
+  func registerItemForType(typeIdentifier: String, loadHandler: ItemProviderLoadHandler)
   var registeredTypeIdentifiers: [AnyObject] { get }
-  func hasItemConformingToTypeIdentifier(typeIdentifier: String) -> Bool
-  func loadItemForTypeIdentifier(typeIdentifier: String, options: [Object : AnyObject]? = [:], completionHandler: ItemProviderCompletionHandler? = nil)
+  func hasItemConformingToType(typeIdentifier: String) -> Bool
+  func loadItemForType(typeIdentifier: String, options: [Object : AnyObject]? = [:], completionHandler: ItemProviderCompletionHandler? = nil)
   convenience init()
   @available(iOS 8.0, *)
   func copy(zone zone: Zone = nil) -> AnyObject
@@ -3981,7 +3981,7 @@ class NotificationCenter : Object {
   func removeObserver(observer: AnyObject)
   func removeObserver(observer: AnyObject, name aName: String?, object anObject: AnyObject?)
   @available(iOS 4.0, *)
-  func addObserverForName(name: String?, object obj: AnyObject?, queue: OperationQueue?, usingBlock block: (Notification) -> Void) -> ObjectProtocol
+  func addObserverFor(name: String?, object obj: AnyObject?, queue: OperationQueue?, usingBlock block: (Notification) -> Void) -> ObjectProtocol
   init()
 }
 enum PostingStyle : UInt {
@@ -8745,7 +8745,7 @@ class URLResponse : Object, SecureCoding, Copying {
       @result The initialized NSURLResponse.
       @discussion This is the designated initializer for NSURLResponse.
   */
-  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncodingName name: String?)
+  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncoding name: String?)
 
   /*! 
       @method URL
@@ -8877,7 +8877,7 @@ class HTTPURLResponse : URLResponse {
       @result The initialized NSURLResponse.
       @discussion This is the designated initializer for NSURLResponse.
   */
-  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncodingName name: String?)
+  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncoding name: String?)
   convenience init()
   init?(coder aDecoder: Coder)
 }
@@ -9075,12 +9075,12 @@ class UserDefaults : Object {
   func removeSuiteNamed(suiteName: String)
   func dictionaryRepresentation() -> [String : AnyObject]
   var volatileDomainNames: [String] { get }
-  func volatileDomainForName(domainName: String) -> [String : AnyObject]
+  func volatileDomainFor(domainName: String) -> [String : AnyObject]
   func setVolatileDomain(domain: [String : AnyObject], forName domainName: String)
-  func removeVolatileDomainForName(domainName: String)
-  func persistentDomainForName(domainName: String) -> [String : AnyObject]?
+  func removeVolatileDomainFor(domainName: String)
+  func persistentDomainFor(domainName: String) -> [String : AnyObject]?
   func setPersistentDomain(domain: [String : AnyObject], forName domainName: String)
-  func removePersistentDomainForName(domainName: String)
+  func removePersistentDomainFor(domainName: String)
   func synchronize() -> Bool
   func objectIsForcedForKey(key: String) -> Bool
   func objectIsForcedForKey(key: String, inDomain domain: String) -> Bool
@@ -9217,12 +9217,12 @@ extension XMLParser {
 protocol XMLParserDelegate : ObjectProtocol {
   optional func parserDidStartDocument(parser: XMLParser)
   optional func parserDidEndDocument(parser: XMLParser)
-  optional func parser(parser: XMLParser, foundNotationDeclarationWithName name: String, publicID: String?, systemID: String?)
-  optional func parser(parser: XMLParser, foundUnparsedEntityDeclarationWithName name: String, publicID: String?, systemID: String?, notationName: String?)
-  optional func parser(parser: XMLParser, foundAttributeDeclarationWithName attributeName: String, forElement elementName: String, type: String?, defaultValue: String?)
-  optional func parser(parser: XMLParser, foundElementDeclarationWithName elementName: String, model: String)
-  optional func parser(parser: XMLParser, foundInternalEntityDeclarationWithName name: String, value: String?)
-  optional func parser(parser: XMLParser, foundExternalEntityDeclarationWithName name: String, publicID: String?, systemID: String?)
+  optional func parser(parser: XMLParser, foundNotationDeclarationWith name: String, publicID: String?, systemID: String?)
+  optional func parser(parser: XMLParser, foundUnparsedEntityDeclarationWith name: String, publicID: String?, systemID: String?, notationName: String?)
+  optional func parser(parser: XMLParser, foundAttributeDeclarationWith attributeName: String, forElement elementName: String, type: String?, defaultValue: String?)
+  optional func parser(parser: XMLParser, foundElementDeclarationWith elementName: String, model: String)
+  optional func parser(parser: XMLParser, foundInternalEntityDeclarationWith name: String, value: String?)
+  optional func parser(parser: XMLParser, foundExternalEntityDeclarationWith name: String, publicID: String?, systemID: String?)
   optional func parser(parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String] = [:])
   optional func parser(parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?)
   optional func parser(parser: XMLParser, didStartMappingPrefix prefix: String, toURI namespaceURI: String)
diff --git a/Platforms/iOS/GameKit.swift b/Platforms/iOS/GameKit.swift
index 776181c..75394b5 100644
--- a/Platforms/iOS/GameKit.swift
+++ b/Platforms/iOS/GameKit.swift
@@ -536,7 +536,7 @@ protocol GKPeerPickerControllerDelegate : ObjectProtocol {
 }
 @available(iOS 4.1, *)
 class GKPlayer : Object {
-  class func loadPlayersForIdentifiers(identifiers: [String], withCompletionHandler completionHandler: (([GKPlayer]?, Error?) -> Void)? = nil)
+  class func loadPlayersFor(identifiers: [String], withCompletionHandler completionHandler: (([GKPlayer]?, Error?) -> Void)? = nil)
   var playerID: String? { get }
   @available(iOS 6.0, *)
   var displayName: String? { get }
diff --git a/Platforms/iOS/HealthKit.swift b/Platforms/iOS/HealthKit.swift
index 54a6bd8..9b45e75 100644
--- a/Platforms/iOS/HealthKit.swift
+++ b/Platforms/iOS/HealthKit.swift
@@ -1170,10 +1170,10 @@ class HKObjectType : Object, SecureCoding, Copying {
    @discussion    See HKTypeIdentifiers.h for possible values.
    */
   var identifier: String { get }
-  class func quantityTypeForIdentifier(identifier: String) -> HKQuantityType?
-  class func categoryTypeForIdentifier(identifier: String) -> HKCategoryType?
-  class func characteristicTypeForIdentifier(identifier: String) -> HKCharacteristicType?
-  class func correlationTypeForIdentifier(identifier: String) -> HKCorrelationType?
+  class func quantityTypeFor(identifier: String) -> HKQuantityType?
+  class func categoryTypeFor(identifier: String) -> HKCategoryType?
+  class func characteristicTypeFor(identifier: String) -> HKCharacteristicType?
+  class func correlationTypeFor(identifier: String) -> HKCorrelationType?
   class func workoutType() -> HKWorkoutType
   @available(iOS 8.0, *)
   class func supportsSecureCoding() -> Bool
diff --git a/Platforms/iOS/MapKit.swift b/Platforms/iOS/MapKit.swift
index c41e0d1..b4a7f4b 100644
--- a/Platforms/iOS/MapKit.swift
+++ b/Platforms/iOS/MapKit.swift
@@ -17,7 +17,7 @@ enum MKAnnotationViewDragState : UInt {
 }
 @available(iOS 3.0, *)
 class MKAnnotationView : UIView {
-  init(annotation: MKAnnotation?, reuseIdentifier: String?)
+  init(annotation: MKAnnotation?, reuse reuseIdentifier: String?)
   var reuseIdentifier: String? { get }
   func prepareForReuse()
   var annotation: MKAnnotation?
@@ -599,7 +599,7 @@ class MKPinAnnotationView : MKAnnotationView {
   var animatesDrop: Bool
   @available(iOS, introduced=3.0, deprecated=9.0, message="Use pinTintColor instead")
   var pinColor: MKPinAnnotationColor
-  init(annotation: MKAnnotation?, reuseIdentifier: String?)
+  init(annotation: MKAnnotation?, reuse reuseIdentifier: String?)
   init(frame: CGRect)
   init?(coder aDecoder: Coder)
   convenience init()
diff --git a/Platforms/iOS/MediaPlayer.swift b/Platforms/iOS/MediaPlayer.swift
index 2eb673d..ca2b8ae 100644
--- a/Platforms/iOS/MediaPlayer.swift
+++ b/Platforms/iOS/MediaPlayer.swift
@@ -835,7 +835,7 @@ enum MPNowPlayingInfoLanguageOptionType : UInt {
 /// Represents a single language option option.
 @available(iOS 9.0, *)
 class MPNowPlayingInfoLanguageOption : Object {
-  init(type languageOptionType: MPNowPlayingInfoLanguageOptionType, languageTag: String, characteristics languageOptionCharacteristics: [String]?, displayName: String, identifier: String)
+  init(type languageOptionType: MPNowPlayingInfoLanguageOptionType, languageTag: String, characteristics languageOptionCharacteristics: [String]?, display displayName: String, identifier: String)
 
   /// Represents a special case that is used to
   /// represent the best legible language option based on system preferences.
diff --git a/Platforms/iOS/MessageUI.swift b/Platforms/iOS/MessageUI.swift
index 5eecdb6..cd1ccee 100644
--- a/Platforms/iOS/MessageUI.swift
+++ b/Platforms/iOS/MessageUI.swift
@@ -342,7 +342,7 @@ class MFMessageComposeViewController : UINavigationController {
    the attachment was not added to the composition.  The data and typeIdentifer must be non-nil.  typeIdentifier should be a valid Uniform Type Identifier.
    */
   @available(iOS 7.0, *)
-  func addAttachmentData(attachmentData: Data, typeIdentifier uti: String, filename: String) -> Bool
+  func addAttachmentData(attachmentData: Data, type uti: String, filename: String) -> Bool
   @available(iOS 5.0, *)
   init(navigationBarClass: AnyClass?, toolbarClass: AnyClass?)
   init(rootViewController: UIViewController)
diff --git a/Platforms/iOS/Metal.swift b/Platforms/iOS/Metal.swift
index 9739505..b539454 100644
--- a/Platforms/iOS/Metal.swift
+++ b/Platforms/iOS/Metal.swift
@@ -111,7 +111,7 @@ class MTLStructMember : Object {
 @available(iOS 8.0, *)
 class MTLStructType : Object {
   var members: [MTLStructMember] { get }
-  func memberByName(name: String) -> MTLStructMember?
+  func memberBy(name: String) -> MTLStructMember?
   init()
 }
 @available(iOS 8.0, *)
diff --git a/Platforms/iOS/MultipeerConnectivity.swift b/Platforms/iOS/MultipeerConnectivity.swift
index c60c955..7078e30 100644
--- a/Platforms/iOS/MultipeerConnectivity.swift
+++ b/Platforms/iOS/MultipeerConnectivity.swift
@@ -255,7 +255,7 @@ protocol MCNearbyServiceBrowserDelegate : ObjectProtocol {
  */
 @available(iOS 7.0, *)
 class MCPeerID : Object, Copying, SecureCoding {
-  init(displayName myDisplayName: String)
+  init(display myDisplayName: String)
   var displayName: String { get }
   convenience init()
   @available(iOS 7.0, *)
@@ -358,9 +358,9 @@ protocol MCSessionDelegate : ObjectProtocol {
   @available(iOS 7.0, *)
   func session(session: MCSession, didReceive stream: InputStream, withName streamName: String, fromPeer peerID: MCPeerID)
   @available(iOS 7.0, *)
-  func session(session: MCSession, didStartReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, withProgress progress: Progress)
+  func session(session: MCSession, didStartReceivingResourceWith resourceName: String, fromPeer peerID: MCPeerID, withProgress progress: Progress)
   @available(iOS 7.0, *)
-  func session(session: MCSession, didFinishReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL, withError error: Error?)
+  func session(session: MCSession, didFinishReceivingResourceWith resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL, withError error: Error?)
   @available(iOS 7.0, *)
   optional func session(session: MCSession, didReceiveCertificate certificate: [AnyObject]?, fromPeer peerID: MCPeerID, certificateHandler: (Bool) -> Void)
 }
diff --git a/Platforms/iOS/NetworkExtension.swift b/Platforms/iOS/NetworkExtension.swift
index acd1573..47ca2af 100644
--- a/Platforms/iOS/NetworkExtension.swift
+++ b/Platforms/iOS/NetworkExtension.swift
@@ -263,7 +263,7 @@ class NEAppRule : Object, SecureCoding, Copying {
    * @param signingIdentifier The signing identifier of the executable that matches the rule.
    */
   @available(iOS 9.0, *)
-  init(signingIdentifier: String)
+  init(signing signingIdentifier: String)
 
   /*!
    * @property matchSigningIdentifier
diff --git a/Platforms/iOS/PassKit.swift b/Platforms/iOS/PassKit.swift
index 560d718..37813a6 100644
--- a/Platforms/iOS/PassKit.swift
+++ b/Platforms/iOS/PassKit.swift
@@ -188,7 +188,7 @@ class PKPassLibrary : Object {
   @available(iOS 9.0, *)
   func isPaymentPassActivationAvailable() -> Bool
   func passes() -> [PKPass]
-  func pass(passTypeIdentifier identifier: String, serialNumber: String) -> PKPass?
+  func pass(passType identifier: String, serialNumber: String) -> PKPass?
   @available(iOS 8.0, *)
   func passesOf(passType: PKPassType) -> [PKPass]
   @available(iOS 9.0, *)
diff --git a/Platforms/iOS/SpriteKit.swift b/Platforms/iOS/SpriteKit.swift
index 93f18bd..3211f2d 100644
--- a/Platforms/iOS/SpriteKit.swift
+++ b/Platforms/iOS/SpriteKit.swift
@@ -489,7 +489,7 @@ extension SKAction {
    @param name the name of a child object
    @see SKNode.name
    */
-  class func run(action: SKAction, onChildWithName name: String) -> SKAction
+  class func run(action: SKAction, onChildWith name: String) -> SKAction
 
   /** Creates an action that executes a block over a duration
    @param duration The duration of the animation
diff --git a/Platforms/iOS/UIKit.swift b/Platforms/iOS/UIKit.swift
index 129373a..67f8de7 100644
--- a/Platforms/iOS/UIKit.swift
+++ b/Platforms/iOS/UIKit.swift
@@ -1686,13 +1686,13 @@ protocol UIApplicationDelegate : ObjectProtocol {
   @available(iOS 4.0, *)
   optional func application(application: UIApplication, didReceive notification: UILocalNotification)
   @available(iOS 8.0, *)
-  optional func application(application: UIApplication, handleActionWithIdentifier identifier: String?, forLocalNotification notification: UILocalNotification, completionHandler: () -> Void)
+  optional func application(application: UIApplication, handleActionWith identifier: String?, forLocalNotification notification: UILocalNotification, completionHandler: () -> Void)
   @available(iOS 9.0, *)
-  optional func application(application: UIApplication, handleActionWithIdentifier identifier: String?, forRemoteNotification userInfo: [Object : AnyObject], withResponseInfo responseInfo: [Object : AnyObject], completionHandler: () -> Void)
+  optional func application(application: UIApplication, handleActionWith identifier: String?, forRemoteNotification userInfo: [Object : AnyObject], withResponseInfo responseInfo: [Object : AnyObject], completionHandler: () -> Void)
   @available(iOS 8.0, *)
-  optional func application(application: UIApplication, handleActionWithIdentifier identifier: String?, forRemoteNotification userInfo: [Object : AnyObject], completionHandler: () -> Void)
+  optional func application(application: UIApplication, handleActionWith identifier: String?, forRemoteNotification userInfo: [Object : AnyObject], completionHandler: () -> Void)
   @available(iOS 9.0, *)
-  optional func application(application: UIApplication, handleActionWithIdentifier identifier: String?, forLocalNotification notification: UILocalNotification, withResponseInfo responseInfo: [Object : AnyObject], completionHandler: () -> Void)
+  optional func application(application: UIApplication, handleActionWith identifier: String?, forLocalNotification notification: UILocalNotification, withResponseInfo responseInfo: [Object : AnyObject], completionHandler: () -> Void)
 
   /*! This delegate method offers an opportunity for applications with the "remote-notification" background mode to fetch appropriate new data in response to an incoming remote notification. You should call the fetchCompletionHandler as soon as you're finished performing that operation, so the system can accurately estimate its power and data cost.
    
@@ -2402,12 +2402,12 @@ class UICollectionView : UIScrollView {
   weak var delegate: @sil_weak UICollectionViewDelegate?
   weak var dataSource: @sil_weak UICollectionViewDataSource?
   var backgroundView: UIView?
-  func register(cellClass: AnyClass?, forCellWithReuseIdentifier identifier: String)
-  func register(nib: UINib?, forCellWithReuseIdentifier identifier: String)
-  func register(viewClass: AnyClass?, forSupplementaryViewOfKind elementKind: String, withReuseIdentifier identifier: String)
-  func register(nib: UINib?, forSupplementaryViewOfKind kind: String, withReuseIdentifier identifier: String)
-  func dequeueReusableCell(reuseIdentifier identifier: String, forIndexPath indexPath: IndexPath) -> UICollectionViewCell
-  func dequeueReusableSupplementaryViewOfKind(elementKind: String, withReuseIdentifier identifier: String, forIndexPath indexPath: IndexPath) -> UICollectionReusableView
+  func register(cellClass: AnyClass?, forCellWithReuse identifier: String)
+  func register(nib: UINib?, forCellWithReuse identifier: String)
+  func register(viewClass: AnyClass?, forSupplementaryViewOfKind elementKind: String, withReuse identifier: String)
+  func register(nib: UINib?, forSupplementaryViewOfKind kind: String, withReuse identifier: String)
+  func dequeueReusableCell(reuse identifier: String, forIndexPath indexPath: IndexPath) -> UICollectionViewCell
+  func dequeueReusableSupplementaryViewOfKind(elementKind: String, withReuse identifier: String, forIndexPath indexPath: IndexPath) -> UICollectionReusableView
   var allowsSelection: Bool
   var allowsMultipleSelection: Bool
   func indexPathsForSelectedItems() -> [IndexPath]?
@@ -7017,13 +7017,13 @@ class UITableView : UIScrollView, Coding {
   @available(iOS 6.0, *)
   func dequeueReusableHeaderFooterView(identifier identifier: String) -> UITableViewHeaderFooterView?
   @available(iOS 5.0, *)
-  func register(nib: UINib?, forCellReuseIdentifier identifier: String)
+  func register(nib: UINib?, forCellReuse identifier: String)
   @available(iOS 6.0, *)
-  func register(cellClass: AnyClass?, forCellReuseIdentifier identifier: String)
+  func register(cellClass: AnyClass?, forCellReuse identifier: String)
   @available(iOS 6.0, *)
-  func register(nib: UINib?, forHeaderFooterViewReuseIdentifier identifier: String)
+  func register(nib: UINib?, forHeaderFooterViewReuse identifier: String)
   @available(iOS 6.0, *)
-  func register(aClass: AnyClass?, forHeaderFooterViewReuseIdentifier identifier: String)
+  func register(aClass: AnyClass?, forHeaderFooterViewReuse identifier: String)
   @available(iOS 9.0, *)
   var remembersLastFocusedIndexPath: Bool
   convenience init(frame: CGRect)
@@ -7116,7 +7116,7 @@ struct UITableViewCellStateMask : OptionSetType {
 @available(iOS 2.0, *)
 class UITableViewCell : UIView, Coding, UIGestureRecognizerDelegate {
   @available(iOS 3.0, *)
-  init(style: UITableViewCellStyle, reuseIdentifier: String?)
+  init(style: UITableViewCellStyle, reuse reuseIdentifier: String?)
   init?(coder aDecoder: Coder)
   @available(iOS 3.0, *)
   var imageView: UIImageView? { get }
@@ -7309,7 +7309,7 @@ class UITableViewController : UIViewController, UITableViewDelegate, UITableView
 }
 @available(iOS 6.0, *)
 class UITableViewHeaderFooterView : UIView {
-  init(reuseIdentifier: String?)
+  init(reuse reuseIdentifier: String?)
   init?(coder aDecoder: Coder)
   var tintColor: UIColor!
   var textLabel: UILabel? { get }
@@ -9257,7 +9257,7 @@ class UIWebView : UIView, Coding, UIScrollViewDelegate {
   var scrollView: UIScrollView { get }
   func loadRequest(request: URLRequest)
   func loadHTMLString(string: String, baseURL: URL?)
-  func load(data: Data, mimeType MIMEType: String, textEncodingName: String, baseURL: URL)
+  func load(data: Data, mimeType MIMEType: String, textEncoding textEncodingName: String, baseURL: URL)
   var request: URLRequest? { get }
   func reload()
   func stopLoading()
diff --git a/Platforms/iOS/WebKit.swift b/Platforms/iOS/WebKit.swift
index 834fa50..9f8bbb0 100644
--- a/Platforms/iOS/WebKit.swift
+++ b/Platforms/iOS/WebKit.swift
@@ -530,7 +530,7 @@ class WKUserContentController : Object {
   /*! @abstract Removes a script message handler.
    @param name The name of the message handler to remove.
    */
-  func removeScriptMessageHandlerForName(name: String)
+  func removeScriptMessageHandlerFor(name: String)
   init()
 }
 
@@ -626,7 +626,7 @@ class WKWebView : UIView {
    @result A new navigation.
    */
   @available(iOS 9.0, *)
-  func load(data: Data, mimeType MIMEType: String, characterEncodingName: String, baseURL: URL) -> WKNavigation?
+  func load(data: Data, mimeType MIMEType: String, characterEncoding characterEncodingName: String, baseURL: URL) -> WKNavigation?
 
   /*! @abstract Navigates to an item from the back-forward list and sets it
    as the current item.
diff --git a/Platforms/tvOS/AVFoundation.swift b/Platforms/tvOS/AVFoundation.swift
index 700771c..6687610 100644
--- a/Platforms/tvOS/AVFoundation.swift
+++ b/Platforms/tvOS/AVFoundation.swift
@@ -11917,7 +11917,7 @@ extension AVMetadataItem {
   	@result			An instance of NSArray containing the metadata items of the target NSArray that match the specified identifier.
   */
   @available(tvOS 8.0, *)
-  class func metadataItemsFrom(metadataItems: [AVMetadataItem], filteredByIdentifier identifier: String) -> [AVMetadataItem]
+  class func metadataItemsFrom(metadataItems: [AVMetadataItem], filteredBy identifier: String) -> [AVMetadataItem]
 
   /*!
   	@method			metadataItemsFromArray:filteredByMetadataItemFilter:
@@ -11949,9 +11949,9 @@ extension AVMetadataItem {
   @available(tvOS 8.0, *)
   class func identifierForKey(key: AnyObject, keySpace: String) -> String?
   @available(tvOS 8.0, *)
-  class func keySpaceForIdentifier(identifier: String) -> String?
+  class func keySpaceFor(identifier: String) -> String?
   @available(tvOS 8.0, *)
-  class func keyForIdentifier(identifier: String) -> AnyObject?
+  class func keyFor(identifier: String) -> AnyObject?
   @NSCopying var key: protocol<Copying, ObjectProtocol>? { get }
   var commonKey: String? { get }
   var keySpace: String? { get }
diff --git a/Platforms/tvOS/CloudKit.swift b/Platforms/tvOS/CloudKit.swift
index 0d55312..2d7f496 100644
--- a/Platforms/tvOS/CloudKit.swift
+++ b/Platforms/tvOS/CloudKit.swift
@@ -401,8 +401,8 @@ extension CLLocation : CKRecordValue {
 }
 @available(tvOS 8.0, *)
 class CKRecordID : Object, SecureCoding, Copying {
-  convenience init(recordName: String)
-  init(recordName: String, zoneID: CKRecordZoneID)
+  convenience init(record recordName: String)
+  init(record recordName: String, zoneID: CKRecordZoneID)
   var recordName: String { get }
   var zoneID: CKRecordZoneID { get }
   @available(tvOS 8.0, *)
diff --git a/Platforms/tvOS/CoreData.swift b/Platforms/tvOS/CoreData.swift
index 3b34920..7cf8ba9 100644
--- a/Platforms/tvOS/CoreData.swift
+++ b/Platforms/tvOS/CoreData.swift
@@ -190,8 +190,8 @@ struct _requestFlags {
 }
 @available(tvOS 3.0, *)
 class NSEntityDescription : Object, Coding, Copying, FastEnumeration {
-  class func entityForName(entityName: String, in context: NSManagedObjectContext) -> NSEntityDescription?
-  class func insertNewObjectForEntityForName(entityName: String, in context: NSManagedObjectContext) -> NSManagedObject
+  class func entityFor(entityName: String, in context: NSManagedObjectContext) -> NSEntityDescription?
+  class func insertNewObjectForEntityFor(entityName: String, in context: NSManagedObjectContext) -> NSManagedObject
   unowned(unsafe) var managedObjectModel: @sil_unmanaged NSManagedObjectModel { get }
   var managedObjectClassName: String!
   var name: String?
@@ -688,7 +688,7 @@ class NSManagedObjectModel : Object, Coding, Copying, FastEnumeration {
   func entitiesForConfiguration(configuration: String?) -> [NSEntityDescription]?
   func setEntities(entities: [NSEntityDescription], forConfiguration configuration: String)
   func setFetchRequestTemplate(fetchRequestTemplate: NSFetchRequest?, forName name: String)
-  func fetchRequestTemplateForName(name: String) -> NSFetchRequest?
+  func fetchRequestTemplateFor(name: String) -> NSFetchRequest?
   func fetchRequestFromTemplate(name name: String, substitutionVariables variables: [String : AnyObject]) -> NSFetchRequest?
   var localizationDictionary: [String : String]?
   @available(tvOS 3.0, *)
diff --git a/Platforms/tvOS/CoreImage.swift b/Platforms/tvOS/CoreImage.swift
index 449397d..f6f5581 100644
--- a/Platforms/tvOS/CoreImage.swift
+++ b/Platforms/tvOS/CoreImage.swift
@@ -465,7 +465,7 @@ extension CIFilter {
    @param   attributes    Dictionary of the registration attributes of the filter. See below for attribute keys.
   */
   @available(tvOS 9.0, *)
-  class func registerName(name: String, constructor anObject: CIFilterConstructor, classAttributes attributes: [String : AnyObject] = [:])
+  class func register(name: String, constructor anObject: CIFilterConstructor, classAttributes attributes: [String : AnyObject] = [:])
 
   /** Returns the localized name of a filter for display in the UI. */
   @available(tvOS 9.0, *)
diff --git a/Platforms/tvOS/Foundation.swift b/Platforms/tvOS/Foundation.swift
index a923e03..be21b5a 100644
--- a/Platforms/tvOS/Foundation.swift
+++ b/Platforms/tvOS/Foundation.swift
@@ -3074,12 +3074,12 @@ typealias ItemProviderCompletionHandler = (SecureCoding?, Error!) -> Void
 typealias ItemProviderLoadHandler = (ItemProviderCompletionHandler!, AnyClass!, [Object : AnyObject]!) -> Void
 @available(tvOS 8.0, *)
 class ItemProvider : Object, Copying {
-  init(item: SecureCoding?, typeIdentifier: String?)
+  init(item: SecureCoding?, type typeIdentifier: String?)
   convenience init?(contentsOf fileURL: URL!)
-  func registerItemForTypeIdentifier(typeIdentifier: String, loadHandler: ItemProviderLoadHandler)
+  func registerItemForType(typeIdentifier: String, loadHandler: ItemProviderLoadHandler)
   var registeredTypeIdentifiers: [AnyObject] { get }
-  func hasItemConformingToTypeIdentifier(typeIdentifier: String) -> Bool
-  func loadItemForTypeIdentifier(typeIdentifier: String, options: [Object : AnyObject]? = [:], completionHandler: ItemProviderCompletionHandler? = nil)
+  func hasItemConformingToType(typeIdentifier: String) -> Bool
+  func loadItemForType(typeIdentifier: String, options: [Object : AnyObject]? = [:], completionHandler: ItemProviderCompletionHandler? = nil)
   convenience init()
   @available(tvOS 8.0, *)
   func copy(zone zone: Zone = nil) -> AnyObject
@@ -3981,7 +3981,7 @@ class NotificationCenter : Object {
   func removeObserver(observer: AnyObject)
   func removeObserver(observer: AnyObject, name aName: String?, object anObject: AnyObject?)
   @available(tvOS 4.0, *)
-  func addObserverForName(name: String?, object obj: AnyObject?, queue: OperationQueue?, usingBlock block: (Notification) -> Void) -> ObjectProtocol
+  func addObserverFor(name: String?, object obj: AnyObject?, queue: OperationQueue?, usingBlock block: (Notification) -> Void) -> ObjectProtocol
   init()
 }
 enum PostingStyle : UInt {
@@ -8745,7 +8745,7 @@ class URLResponse : Object, SecureCoding, Copying {
       @result The initialized NSURLResponse.
       @discussion This is the designated initializer for NSURLResponse.
   */
-  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncodingName name: String?)
+  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncoding name: String?)
 
   /*! 
       @method URL
@@ -8877,7 +8877,7 @@ class HTTPURLResponse : URLResponse {
       @result The initialized NSURLResponse.
       @discussion This is the designated initializer for NSURLResponse.
   */
-  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncodingName name: String?)
+  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncoding name: String?)
   convenience init()
   init?(coder aDecoder: Coder)
 }
@@ -9075,12 +9075,12 @@ class UserDefaults : Object {
   func removeSuiteNamed(suiteName: String)
   func dictionaryRepresentation() -> [String : AnyObject]
   var volatileDomainNames: [String] { get }
-  func volatileDomainForName(domainName: String) -> [String : AnyObject]
+  func volatileDomainFor(domainName: String) -> [String : AnyObject]
   func setVolatileDomain(domain: [String : AnyObject], forName domainName: String)
-  func removeVolatileDomainForName(domainName: String)
-  func persistentDomainForName(domainName: String) -> [String : AnyObject]?
+  func removeVolatileDomainFor(domainName: String)
+  func persistentDomainFor(domainName: String) -> [String : AnyObject]?
   func setPersistentDomain(domain: [String : AnyObject], forName domainName: String)
-  func removePersistentDomainForName(domainName: String)
+  func removePersistentDomainFor(domainName: String)
   func synchronize() -> Bool
   func objectIsForcedForKey(key: String) -> Bool
   func objectIsForcedForKey(key: String, inDomain domain: String) -> Bool
@@ -9217,12 +9217,12 @@ extension XMLParser {
 protocol XMLParserDelegate : ObjectProtocol {
   optional func parserDidStartDocument(parser: XMLParser)
   optional func parserDidEndDocument(parser: XMLParser)
-  optional func parser(parser: XMLParser, foundNotationDeclarationWithName name: String, publicID: String?, systemID: String?)
-  optional func parser(parser: XMLParser, foundUnparsedEntityDeclarationWithName name: String, publicID: String?, systemID: String?, notationName: String?)
-  optional func parser(parser: XMLParser, foundAttributeDeclarationWithName attributeName: String, forElement elementName: String, type: String?, defaultValue: String?)
-  optional func parser(parser: XMLParser, foundElementDeclarationWithName elementName: String, model: String)
-  optional func parser(parser: XMLParser, foundInternalEntityDeclarationWithName name: String, value: String?)
-  optional func parser(parser: XMLParser, foundExternalEntityDeclarationWithName name: String, publicID: String?, systemID: String?)
+  optional func parser(parser: XMLParser, foundNotationDeclarationWith name: String, publicID: String?, systemID: String?)
+  optional func parser(parser: XMLParser, foundUnparsedEntityDeclarationWith name: String, publicID: String?, systemID: String?, notationName: String?)
+  optional func parser(parser: XMLParser, foundAttributeDeclarationWith attributeName: String, forElement elementName: String, type: String?, defaultValue: String?)
+  optional func parser(parser: XMLParser, foundElementDeclarationWith elementName: String, model: String)
+  optional func parser(parser: XMLParser, foundInternalEntityDeclarationWith name: String, value: String?)
+  optional func parser(parser: XMLParser, foundExternalEntityDeclarationWith name: String, publicID: String?, systemID: String?)
   optional func parser(parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String] = [:])
   optional func parser(parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?)
   optional func parser(parser: XMLParser, didStartMappingPrefix prefix: String, toURI namespaceURI: String)
diff --git a/Platforms/tvOS/GameKit.swift b/Platforms/tvOS/GameKit.swift
index c9c0bb5..16644ce 100644
--- a/Platforms/tvOS/GameKit.swift
+++ b/Platforms/tvOS/GameKit.swift
@@ -453,7 +453,7 @@ class GKNotificationBanner : Object {
 }
 @available(tvOS 4.1, *)
 class GKPlayer : Object {
-  class func loadPlayersForIdentifiers(identifiers: [String], withCompletionHandler completionHandler: (([GKPlayer]?, Error?) -> Void)? = nil)
+  class func loadPlayersFor(identifiers: [String], withCompletionHandler completionHandler: (([GKPlayer]?, Error?) -> Void)? = nil)
   var playerID: String? { get }
   @available(tvOS 6.0, *)
   var displayName: String? { get }
diff --git a/Platforms/tvOS/MediaPlayer.swift b/Platforms/tvOS/MediaPlayer.swift
index ae301aa..2daed4b 100644
--- a/Platforms/tvOS/MediaPlayer.swift
+++ b/Platforms/tvOS/MediaPlayer.swift
@@ -257,7 +257,7 @@ enum MPNowPlayingInfoLanguageOptionType : UInt {
 /// Represents a single language option option.
 @available(tvOS 9.0, *)
 class MPNowPlayingInfoLanguageOption : Object {
-  init(type languageOptionType: MPNowPlayingInfoLanguageOptionType, languageTag: String, characteristics languageOptionCharacteristics: [String]?, displayName: String, identifier: String)
+  init(type languageOptionType: MPNowPlayingInfoLanguageOptionType, languageTag: String, characteristics languageOptionCharacteristics: [String]?, display displayName: String, identifier: String)
 
   /// Represents a special case that is used to
   /// represent the best legible language option based on system preferences.
diff --git a/Platforms/tvOS/Metal.swift b/Platforms/tvOS/Metal.swift
index 055ab5d..aadbd84 100644
--- a/Platforms/tvOS/Metal.swift
+++ b/Platforms/tvOS/Metal.swift
@@ -111,7 +111,7 @@ class MTLStructMember : Object {
 @available(tvOS 8.0, *)
 class MTLStructType : Object {
   var members: [MTLStructMember] { get }
-  func memberByName(name: String) -> MTLStructMember?
+  func memberBy(name: String) -> MTLStructMember?
   init()
 }
 @available(tvOS 8.0, *)
diff --git a/Platforms/tvOS/SpriteKit.swift b/Platforms/tvOS/SpriteKit.swift
index 5e8a336..18c9a4c 100644
--- a/Platforms/tvOS/SpriteKit.swift
+++ b/Platforms/tvOS/SpriteKit.swift
@@ -489,7 +489,7 @@ extension SKAction {
    @param name the name of a child object
    @see SKNode.name
    */
-  class func run(action: SKAction, onChildWithName name: String) -> SKAction
+  class func run(action: SKAction, onChildWith name: String) -> SKAction
 
   /** Creates an action that executes a block over a duration
    @param duration The duration of the animation
diff --git a/Platforms/tvOS/UIKit.swift b/Platforms/tvOS/UIKit.swift
index 15c5410..4e59e2f 100644
--- a/Platforms/tvOS/UIKit.swift
+++ b/Platforms/tvOS/UIKit.swift
@@ -1887,12 +1887,12 @@ class UICollectionView : UIScrollView {
   weak var delegate: @sil_weak UICollectionViewDelegate?
   weak var dataSource: @sil_weak UICollectionViewDataSource?
   var backgroundView: UIView?
-  func register(cellClass: AnyClass?, forCellWithReuseIdentifier identifier: String)
-  func register(nib: UINib?, forCellWithReuseIdentifier identifier: String)
-  func register(viewClass: AnyClass?, forSupplementaryViewOfKind elementKind: String, withReuseIdentifier identifier: String)
-  func register(nib: UINib?, forSupplementaryViewOfKind kind: String, withReuseIdentifier identifier: String)
-  func dequeueReusableCell(reuseIdentifier identifier: String, forIndexPath indexPath: IndexPath) -> UICollectionViewCell
-  func dequeueReusableSupplementaryViewOfKind(elementKind: String, withReuseIdentifier identifier: String, forIndexPath indexPath: IndexPath) -> UICollectionReusableView
+  func register(cellClass: AnyClass?, forCellWithReuse identifier: String)
+  func register(nib: UINib?, forCellWithReuse identifier: String)
+  func register(viewClass: AnyClass?, forSupplementaryViewOfKind elementKind: String, withReuse identifier: String)
+  func register(nib: UINib?, forSupplementaryViewOfKind kind: String, withReuse identifier: String)
+  func dequeueReusableCell(reuse identifier: String, forIndexPath indexPath: IndexPath) -> UICollectionViewCell
+  func dequeueReusableSupplementaryViewOfKind(elementKind: String, withReuse identifier: String, forIndexPath indexPath: IndexPath) -> UICollectionReusableView
   var allowsSelection: Bool
   var allowsMultipleSelection: Bool
   func indexPathsForSelectedItems() -> [IndexPath]?
@@ -5146,13 +5146,13 @@ class UITableView : UIScrollView, Coding {
   @available(tvOS 6.0, *)
   func dequeueReusableHeaderFooterView(identifier identifier: String) -> UITableViewHeaderFooterView?
   @available(tvOS 5.0, *)
-  func register(nib: UINib?, forCellReuseIdentifier identifier: String)
+  func register(nib: UINib?, forCellReuse identifier: String)
   @available(tvOS 6.0, *)
-  func register(cellClass: AnyClass?, forCellReuseIdentifier identifier: String)
+  func register(cellClass: AnyClass?, forCellReuse identifier: String)
   @available(tvOS 6.0, *)
-  func register(nib: UINib?, forHeaderFooterViewReuseIdentifier identifier: String)
+  func register(nib: UINib?, forHeaderFooterViewReuse identifier: String)
   @available(tvOS 6.0, *)
-  func register(aClass: AnyClass?, forHeaderFooterViewReuseIdentifier identifier: String)
+  func register(aClass: AnyClass?, forHeaderFooterViewReuse identifier: String)
   @available(tvOS 9.0, *)
   var remembersLastFocusedIndexPath: Bool
   convenience init(frame: CGRect)
@@ -5231,7 +5231,7 @@ struct UITableViewCellStateMask : OptionSetType {
 @available(tvOS 2.0, *)
 class UITableViewCell : UIView, Coding, UIGestureRecognizerDelegate {
   @available(tvOS 3.0, *)
-  init(style: UITableViewCellStyle, reuseIdentifier: String?)
+  init(style: UITableViewCellStyle, reuse reuseIdentifier: String?)
   init?(coder aDecoder: Coder)
   @available(tvOS 3.0, *)
   var imageView: UIImageView? { get }
@@ -5408,7 +5408,7 @@ class UITableViewController : UIViewController, UITableViewDelegate, UITableView
 }
 @available(tvOS 6.0, *)
 class UITableViewHeaderFooterView : UIView {
-  init(reuseIdentifier: String?)
+  init(reuse reuseIdentifier: String?)
   init?(coder aDecoder: Coder)
   var tintColor: UIColor!
   var textLabel: UILabel? { get }
diff --git a/Platforms/watchOS/Contacts.swift b/Platforms/watchOS/Contacts.swift
index f89153a..ec6043f 100644
--- a/Platforms/watchOS/Contacts.swift
+++ b/Platforms/watchOS/Contacts.swift
@@ -583,7 +583,7 @@ extension CNContact {
    *
    * @discussion The name can contain any number of words.
    */
-  class func predicateForContactsMatchingName(name: String) -> Predicate
+  class func predicateForContactsMatching(name: String) -> Predicate
 
   /*! To fetch contacts matching contact identifiers. */
   class func predicateForContacts(identifiers identifiers: [String]) -> Predicate
diff --git a/Platforms/watchOS/CoreData.swift b/Platforms/watchOS/CoreData.swift
index 9a9bf18..e32cd53 100644
--- a/Platforms/watchOS/CoreData.swift
+++ b/Platforms/watchOS/CoreData.swift
@@ -190,8 +190,8 @@ struct _requestFlags {
 }
 @available(watchOS 2.0, *)
 class NSEntityDescription : Object, Coding, Copying, FastEnumeration {
-  class func entityForName(entityName: String, in context: NSManagedObjectContext) -> NSEntityDescription?
-  class func insertNewObjectForEntityForName(entityName: String, in context: NSManagedObjectContext) -> NSManagedObject
+  class func entityFor(entityName: String, in context: NSManagedObjectContext) -> NSEntityDescription?
+  class func insertNewObjectForEntityFor(entityName: String, in context: NSManagedObjectContext) -> NSManagedObject
   unowned(unsafe) var managedObjectModel: @sil_unmanaged NSManagedObjectModel { get }
   var managedObjectClassName: String!
   var name: String?
@@ -688,7 +688,7 @@ class NSManagedObjectModel : Object, Coding, Copying, FastEnumeration {
   func entitiesForConfiguration(configuration: String?) -> [NSEntityDescription]?
   func setEntities(entities: [NSEntityDescription], forConfiguration configuration: String)
   func setFetchRequestTemplate(fetchRequestTemplate: NSFetchRequest?, forName name: String)
-  func fetchRequestTemplateForName(name: String) -> NSFetchRequest?
+  func fetchRequestTemplateFor(name: String) -> NSFetchRequest?
   func fetchRequestFromTemplate(name name: String, substitutionVariables variables: [String : AnyObject]) -> NSFetchRequest?
   var localizationDictionary: [String : String]?
   @available(watchOS 2.0, *)
diff --git a/Platforms/watchOS/Foundation.swift b/Platforms/watchOS/Foundation.swift
index 004080d..a69486e 100644
--- a/Platforms/watchOS/Foundation.swift
+++ b/Platforms/watchOS/Foundation.swift
@@ -3116,12 +3116,12 @@ typealias ItemProviderCompletionHandler = (SecureCoding?, Error!) -> Void
 typealias ItemProviderLoadHandler = (ItemProviderCompletionHandler!, AnyClass!, [Object : AnyObject]!) -> Void
 @available(watchOS 2.0, *)
 class ItemProvider : Object, Copying {
-  init(item: SecureCoding?, typeIdentifier: String?)
+  init(item: SecureCoding?, type typeIdentifier: String?)
   convenience init?(contentsOf fileURL: URL!)
-  func registerItemForTypeIdentifier(typeIdentifier: String, loadHandler: ItemProviderLoadHandler)
+  func registerItemForType(typeIdentifier: String, loadHandler: ItemProviderLoadHandler)
   var registeredTypeIdentifiers: [AnyObject] { get }
-  func hasItemConformingToTypeIdentifier(typeIdentifier: String) -> Bool
-  func loadItemForTypeIdentifier(typeIdentifier: String, options: [Object : AnyObject]? = [:], completionHandler: ItemProviderCompletionHandler? = nil)
+  func hasItemConformingToType(typeIdentifier: String) -> Bool
+  func loadItemForType(typeIdentifier: String, options: [Object : AnyObject]? = [:], completionHandler: ItemProviderCompletionHandler? = nil)
   convenience init()
   @available(watchOS 2.0, *)
   func copy(zone zone: Zone = nil) -> AnyObject
@@ -3963,7 +3963,7 @@ class NotificationCenter : Object {
   func removeObserver(observer: AnyObject)
   func removeObserver(observer: AnyObject, name aName: String?, object anObject: AnyObject?)
   @available(watchOS 2.0, *)
-  func addObserverForName(name: String?, object obj: AnyObject?, queue: OperationQueue?, usingBlock block: (Notification) -> Void) -> ObjectProtocol
+  func addObserverFor(name: String?, object obj: AnyObject?, queue: OperationQueue?, usingBlock block: (Notification) -> Void) -> ObjectProtocol
   init()
 }
 enum PostingStyle : UInt {
@@ -8725,7 +8725,7 @@ class URLResponse : Object, SecureCoding, Copying {
       @result The initialized NSURLResponse.
       @discussion This is the designated initializer for NSURLResponse.
   */
-  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncodingName name: String?)
+  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncoding name: String?)
 
   /*! 
       @method URL
@@ -8857,7 +8857,7 @@ class HTTPURLResponse : URLResponse {
       @result The initialized NSURLResponse.
       @discussion This is the designated initializer for NSURLResponse.
   */
-  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncodingName name: String?)
+  init(url URL: URL, mimeType MIMEType: String?, expectedContentLength length: Int, textEncoding name: String?)
   convenience init()
   init?(coder aDecoder: Coder)
 }
@@ -9057,14 +9057,14 @@ class UserDefaults : Object {
   func removeSuiteNamed(suiteName: String)
   func dictionaryRepresentation() -> [String : AnyObject]
   var volatileDomainNames: [String] { get }
-  func volatileDomainForName(domainName: String) -> [String : AnyObject]
+  func volatileDomainFor(domainName: String) -> [String : AnyObject]
   func setVolatileDomain(domain: [String : AnyObject], forName domainName: String)
-  func removeVolatileDomainForName(domainName: String)
+  func removeVolatileDomainFor(domainName: String)
   @available(watchOS, introduced=2.0, deprecated=2.0)
   func persistentDomainNames() -> [AnyObject]
-  func persistentDomainForName(domainName: String) -> [String : AnyObject]?
+  func persistentDomainFor(domainName: String) -> [String : AnyObject]?
   func setPersistentDomain(domain: [String : AnyObject], forName domainName: String)
-  func removePersistentDomainForName(domainName: String)
+  func removePersistentDomainFor(domainName: String)
   func synchronize() -> Bool
   func objectIsForcedForKey(key: String) -> Bool
   func objectIsForcedForKey(key: String, inDomain domain: String) -> Bool
@@ -9201,12 +9201,12 @@ extension XMLParser {
 protocol XMLParserDelegate : ObjectProtocol {
   optional func parserDidStartDocument(parser: XMLParser)
   optional func parserDidEndDocument(parser: XMLParser)
-  optional func parser(parser: XMLParser, foundNotationDeclarationWithName name: String, publicID: String?, systemID: String?)
-  optional func parser(parser: XMLParser, foundUnparsedEntityDeclarationWithName name: String, publicID: String?, systemID: String?, notationName: String?)
-  optional func parser(parser: XMLParser, foundAttributeDeclarationWithName attributeName: String, forElement elementName: String, type: String?, defaultValue: String?)
-  optional func parser(parser: XMLParser, foundElementDeclarationWithName elementName: String, model: String)
-  optional func parser(parser: XMLParser, foundInternalEntityDeclarationWithName name: String, value: String?)
-  optional func parser(parser: XMLParser, foundExternalEntityDeclarationWithName name: String, publicID: String?, systemID: String?)
+  optional func parser(parser: XMLParser, foundNotationDeclarationWith name: String, publicID: String?, systemID: String?)
+  optional func parser(parser: XMLParser, foundUnparsedEntityDeclarationWith name: String, publicID: String?, systemID: String?, notationName: String?)
+  optional func parser(parser: XMLParser, foundAttributeDeclarationWith attributeName: String, forElement elementName: String, type: String?, defaultValue: String?)
+  optional func parser(parser: XMLParser, foundElementDeclarationWith elementName: String, model: String)
+  optional func parser(parser: XMLParser, foundInternalEntityDeclarationWith name: String, value: String?)
+  optional func parser(parser: XMLParser, foundExternalEntityDeclarationWith name: String, publicID: String?, systemID: String?)
   optional func parser(parser: XMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String] = [:])
   optional func parser(parser: XMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?)
   optional func parser(parser: XMLParser, didStartMappingPrefix prefix: String, toURI namespaceURI: String)
diff --git a/Platforms/watchOS/HealthKit.swift b/Platforms/watchOS/HealthKit.swift
index ef3abd6..9be1de1 100644
--- a/Platforms/watchOS/HealthKit.swift
+++ b/Platforms/watchOS/HealthKit.swift
@@ -1161,10 +1161,10 @@ class HKObjectType : Object, SecureCoding, Copying {
    @discussion    See HKTypeIdentifiers.h for possible values.
    */
   var identifier: String { get }
-  class func quantityTypeForIdentifier(identifier: String) -> HKQuantityType?
-  class func categoryTypeForIdentifier(identifier: String) -> HKCategoryType?
-  class func characteristicTypeForIdentifier(identifier: String) -> HKCharacteristicType?
-  class func correlationTypeForIdentifier(identifier: String) -> HKCorrelationType?
+  class func quantityTypeFor(identifier: String) -> HKQuantityType?
+  class func categoryTypeFor(identifier: String) -> HKCategoryType?
+  class func characteristicTypeFor(identifier: String) -> HKCharacteristicType?
+  class func correlationTypeFor(identifier: String) -> HKCorrelationType?
   class func workoutType() -> HKWorkoutType
   @available(watchOS 2.0, *)
   class func supportsSecureCoding() -> Bool
diff --git a/Platforms/watchOS/PassKit.swift b/Platforms/watchOS/PassKit.swift
index 145932d..298ec86 100644
--- a/Platforms/watchOS/PassKit.swift
+++ b/Platforms/watchOS/PassKit.swift
@@ -90,7 +90,7 @@ class PKPassLibrary : Object {
   @available(watchOS 2.0, *)
   func isPaymentPassActivationAvailable() -> Bool
   func passes() -> [PKPass]
-  func pass(passTypeIdentifier identifier: String, serialNumber: String) -> PKPass?
+  func pass(passType identifier: String, serialNumber: String) -> PKPass?
   @available(watchOS 2.0, *)
   func passesOf(passType: PKPassType) -> [PKPass]
   @available(watchOS 2.0, *)