diff --git a/Platforms/OSX/AVFoundation.swift b/Platforms/OSX/AVFoundation.swift
index 9383aad..2a0cc56 100644
--- a/Platforms/OSX/AVFoundation.swift
+++ b/Platforms/OSX/AVFoundation.swift
@@ -151,7 +151,7 @@ extension AVAsset {
     @result		An instance of AVAssetTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVAssetTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVAssetTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -524,7 +524,7 @@ extension AVFragmentedAsset {
     @result		An instance of AVFragmentedAssetTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVFragmentedAssetTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVFragmentedAssetTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -11675,7 +11675,7 @@ extension AVComposition {
     @result		An instance of AVCompositionTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVCompositionTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVCompositionTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -11846,7 +11846,7 @@ extension AVMutableComposition {
     @result		An instance of AVMutableCompositionTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVMutableCompositionTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVMutableCompositionTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -14437,7 +14437,7 @@ extension AVMovie {
     @result		An instance of AVMovieTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVMovieTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVMovieTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -14738,7 +14738,7 @@ extension AVMutableMovie {
     @result		An instance of AVMutableMovieTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVMutableMovieTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVMutableMovieTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -14869,7 +14869,7 @@ extension AVFragmentedMovie {
     @result		An instance of AVFragmentedMovieTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVFragmentedMovieTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVFragmentedMovieTrack?
 
   /*!
     @method		tracksWithMediaType:
diff --git a/Platforms/OSX/AudioVideoBridging.swift b/Platforms/OSX/AudioVideoBridging.swift
index dfc77b8..3eafcbb 100644
--- a/Platforms/OSX/AudioVideoBridging.swift
+++ b/Platforms/OSX/AudioVideoBridging.swift
@@ -786,7 +786,7 @@ class AVB17221EntityDiscovery : Object {
   	@result		A boolean indicating if the entity was updated.
    */
   @available(OSX 10.9, *)
-  func changeEntity(entityID entityID: UInt64, toNewGPTPGrandmasterID gPTPGrandmasterID: UInt64) throws
+  func changeEntity(id entityID: UInt64, toNewGPTPGrandmasterID gPTPGrandmasterID: UInt64) throws
   init()
 }
 @available(OSX 10.8, *)
diff --git a/Platforms/OSX/CloudKit.swift b/Platforms/OSX/CloudKit.swift
index 67fff9e..3bf0ee6 100644
--- a/Platforms/OSX/CloudKit.swift
+++ b/Platforms/OSX/CloudKit.swift
@@ -55,7 +55,7 @@ extension CKContainer {
   func fetchUserRecordID(completionHandler completionHandler: (CKRecordID?, Error?) -> Void)
   func discoverAllContactUserInfos(completionHandler completionHandler: ([CKDiscoveredUserInfo]?, Error?) -> Void)
   func discoverUserInfo(emailAddress email: String, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
-  func discoverUserInfo(userRecordID userRecordID: CKRecordID, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
+  func discoverUserInfo(id userRecordID: CKRecordID, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
 }
 @available(OSX 10.10, *)
 class CKDatabase : Object {
diff --git a/Platforms/OSX/Foundation.swift b/Platforms/OSX/Foundation.swift
index c5e9548..d0b1303 100644
--- a/Platforms/OSX/Foundation.swift
+++ b/Platforms/OSX/Foundation.swift
@@ -240,8 +240,8 @@ class AppleEventManager : Object {
   func suspendCurrentAppleEvent() -> AppleEventManagerSuspensionID
   func appleEventForSuspensionID(suspensionID: AppleEventManagerSuspensionID) -> AppleEventDescriptor
   func replyAppleEventForSuspensionID(suspensionID: AppleEventManagerSuspensionID) -> AppleEventDescriptor
-  func setCurrentAppleEventAndReplyEvent(suspensionID suspensionID: AppleEventManagerSuspensionID)
-  func resume(suspensionID suspensionID: AppleEventManagerSuspensionID)
+  func setCurrentAppleEventAndReplyEvent(id suspensionID: AppleEventManagerSuspensionID)
+  func resume(id suspensionID: AppleEventManagerSuspensionID)
   init()
 }
 @available(OSX 10.2, *)
@@ -6269,8 +6269,8 @@ extension Object {
   func valueAt(index: Int, inPropertyWithKey key: String) -> AnyObject?
   class func value(name name: String, inPropertyWithKey key: String) -> AnyObject?
   func value(name name: String, inPropertyWithKey key: String) -> AnyObject?
-  class func value(uniqueID uniqueID: AnyObject, inPropertyWithKey key: String) -> AnyObject?
-  func value(uniqueID uniqueID: AnyObject, inPropertyWithKey key: String) -> AnyObject?
+  class func value(id uniqueID: AnyObject, inPropertyWithKey key: String) -> AnyObject?
+  func value(id uniqueID: AnyObject, inPropertyWithKey key: String) -> AnyObject?
   class func insertValue(value: AnyObject, at index: Int, inPropertyWithKey key: String)
   func insertValue(value: AnyObject, at index: Int, inPropertyWithKey key: String)
   class func removeValueAt(index: Int, fromPropertyWithKey key: String)
diff --git a/Platforms/iOS/AVFoundation.swift b/Platforms/iOS/AVFoundation.swift
index 05b4748..4e54793 100644
--- a/Platforms/iOS/AVFoundation.swift
+++ b/Platforms/iOS/AVFoundation.swift
@@ -151,7 +151,7 @@ extension AVAsset {
     @result		An instance of AVAssetTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVAssetTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVAssetTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -482,7 +482,7 @@ extension AVFragmentedAsset {
     @result		An instance of AVFragmentedAssetTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVFragmentedAssetTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVFragmentedAssetTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -13246,7 +13246,7 @@ extension AVComposition {
     @result		An instance of AVCompositionTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVCompositionTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVCompositionTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -13417,7 +13417,7 @@ extension AVMutableComposition {
     @result		An instance of AVMutableCompositionTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVMutableCompositionTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVMutableCompositionTrack?
 
   /*!
     @method		tracksWithMediaType:
diff --git a/Platforms/iOS/CloudKit.swift b/Platforms/iOS/CloudKit.swift
index 1dfc71f..495982f 100644
--- a/Platforms/iOS/CloudKit.swift
+++ b/Platforms/iOS/CloudKit.swift
@@ -55,7 +55,7 @@ extension CKContainer {
   func fetchUserRecordID(completionHandler completionHandler: (CKRecordID?, Error?) -> Void)
   func discoverAllContactUserInfos(completionHandler completionHandler: ([CKDiscoveredUserInfo]?, Error?) -> Void)
   func discoverUserInfo(emailAddress email: String, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
-  func discoverUserInfo(userRecordID userRecordID: CKRecordID, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
+  func discoverUserInfo(id userRecordID: CKRecordID, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
 }
 @available(iOS 8.0, *)
 class CKDatabase : Object {
diff --git a/Platforms/iOS/Photos.swift b/Platforms/iOS/Photos.swift
index 9f4c18d..c684dc5 100644
--- a/Platforms/iOS/Photos.swift
+++ b/Platforms/iOS/Photos.swift
@@ -423,7 +423,7 @@ class PHLivePhoto : Object, Copying, SecureCoding {
   class func request(resourceFileURLs fileURLs: [URL], placeholderImage image: UIImage?, targetSize: CGSize, contentMode: PHImageContentMode, resultHandler: (PHLivePhoto?, [Object : AnyObject]) -> Void) -> PHLivePhotoRequestID
 
   /// Cancels the loading of a PHLivePhoto. The request's completion handler will be called.
-  class func cancelRequest(requestID requestID: PHLivePhotoRequestID)
+  class func cancelRequest(id requestID: PHLivePhotoRequestID)
   init()
   @available(iOS 9.1, *)
   func copy(zone zone: Zone = nil) -> AnyObject
diff --git a/Platforms/tvOS/AVFoundation.swift b/Platforms/tvOS/AVFoundation.swift
index 700771c..f27c62d 100644
--- a/Platforms/tvOS/AVFoundation.swift
+++ b/Platforms/tvOS/AVFoundation.swift
@@ -151,7 +151,7 @@ extension AVAsset {
     @result		An instance of AVAssetTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVAssetTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVAssetTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -482,7 +482,7 @@ extension AVFragmentedAsset {
     @result		An instance of AVFragmentedAssetTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVFragmentedAssetTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVFragmentedAssetTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -9553,7 +9553,7 @@ extension AVComposition {
     @result		An instance of AVCompositionTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVCompositionTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVCompositionTrack?
 
   /*!
     @method		tracksWithMediaType:
@@ -9724,7 +9724,7 @@ extension AVMutableComposition {
     @result		An instance of AVMutableCompositionTrack; may be nil if no track of the specified trackID is available.
     @discussion	Becomes callable without blocking when the key @"tracks" has been loaded
   */
-  func track(trackID trackID: CMPersistentTrackID) -> AVMutableCompositionTrack?
+  func track(id trackID: CMPersistentTrackID) -> AVMutableCompositionTrack?
 
   /*!
     @method		tracksWithMediaType:
diff --git a/Platforms/tvOS/CloudKit.swift b/Platforms/tvOS/CloudKit.swift
index 0d55312..bcfee83 100644
--- a/Platforms/tvOS/CloudKit.swift
+++ b/Platforms/tvOS/CloudKit.swift
@@ -54,7 +54,7 @@ extension CKContainer {
 extension CKContainer {
   func fetchUserRecordID(completionHandler completionHandler: (CKRecordID?, Error?) -> Void)
   func discoverUserInfo(emailAddress email: String, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
-  func discoverUserInfo(userRecordID userRecordID: CKRecordID, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
+  func discoverUserInfo(id userRecordID: CKRecordID, completionHandler: (CKDiscoveredUserInfo?, Error?) -> Void)
 }
 @available(tvOS 8.0, *)
 class CKDatabase : Object {