diff --git a/Yosemite/Yosemite/Tools/Media/MediaAssetExporter.swift b/Yosemite/Yosemite/Tools/Media/MediaAssetExporter.swift
index e54a9b36798..a897f9649cc 100644
--- a/Yosemite/Yosemite/Tools/Media/MediaAssetExporter.swift
+++ b/Yosemite/Yosemite/Tools/Media/MediaAssetExporter.swift
@@ -50,7 +50,7 @@ final class MediaAssetExporter: MediaExporter {
         if let resource = resources.first {
             resourceAvailableLocally = true
             filename = resource.originalFilename
-            if UTTypeEqual(resource.uniformTypeIdentifier as CFString, kUTTypeGIF) {
+            if resource.uniformTypeIdentifier == UTType.gif.identifier {
                 // Handles GIF export differently from images.
                 exportGIF(forAsset: asset, resource: resource, onCompletion: onCompletion)
                 return
@@ -112,7 +112,7 @@ private extension MediaAssetExporter {
                 return nil
         }
         guard allowableFileExtensions.contains(fileExtensionForType) else {
-            return kUTTypeJPEG as String
+            return UTType.jpeg.identifier
         }
         return uti
     }
@@ -123,7 +123,7 @@ private extension MediaAssetExporter {
     /// - parameter onError: Called if an error was encountered during export.
     ///
     private func exportGIF(forAsset asset: PHAsset, resource: PHAssetResource, onCompletion: @escaping MediaExportCompletion) {
-        guard UTTypeEqual(resource.uniformTypeIdentifier as CFString, kUTTypeGIF) else {
+        guard resource.uniformTypeIdentifier == UTType.gif.identifier else {
             onCompletion(nil, AssetExportError.expectedPHAssetGIFType)
             return
         }
diff --git a/Yosemite/Yosemite/Tools/Media/MediaImageExporter.swift b/Yosemite/Yosemite/Tools/Media/MediaImageExporter.swift
index ae04a937b73..bdad9e65539 100644
--- a/Yosemite/Yosemite/Tools/Media/MediaImageExporter.swift
+++ b/Yosemite/Yosemite/Tools/Media/MediaImageExporter.swift
@@ -1,4 +1,5 @@
 import Foundation
+import UniformTypeIdentifiers
 import MobileCoreServices
 
 /// Available options for an image export.
@@ -75,7 +76,7 @@ final class MediaImageExporter: MediaExporter {
                              typeHint: String?,
                              onCompletion: @escaping MediaExportCompletion) {
         do {
-            let hint = typeHint ?? kUTTypeJPEG as String
+            let hint = typeHint ?? UTType.jpeg.identifier
             let sourceOptions: [String: Any] = [kCGImageSourceTypeIdentifierHint as String: hint as CFString]
             guard let source = CGImageSourceCreateWithData(data as CFData, sourceOptions as CFDictionary) else {
                 throw ImageExportError.imageSourceCreationWithDataFailed
diff --git a/Yosemite/YosemiteTests/Tools/Media/MediaImageExporterTests.swift b/Yosemite/YosemiteTests/Tools/Media/MediaImageExporterTests.swift
index 192998c66ec..5fff2b366b7 100644
--- a/Yosemite/YosemiteTests/Tools/Media/MediaImageExporterTests.swift
+++ b/Yosemite/YosemiteTests/Tools/Media/MediaImageExporterTests.swift
@@ -1,5 +1,6 @@
 import MobileCoreServices
 import XCTest
+import UniformTypeIdentifiers
 @testable import Yosemite
 
 final class MediaImageExporterTests: XCTestCase {
@@ -7,7 +8,7 @@ final class MediaImageExporterTests: XCTestCase {
         // Loads the test image into png data.
         let mockData = UIImage(named: "image", in: Bundle(for: type(of: self)), compatibleWith: nil)!.pngData()
         let filename = "test"
-        let typeHint = kUTTypeJPEG as String
+        let typeHint = UTType.jpeg.identifier
         let mockImageSourceWriter = MockImageSourceWriter()
         let exporter = MediaImageExporter(data: mockData!,
                                           filename: filename,
@@ -65,7 +66,7 @@ final class MediaImageExporterTests: XCTestCase {
     func testExportingNonImageData() {
         let mockData = Data()
         let filename = "test"
-        let typeHint = kUTTypeJPEG as String
+        let typeHint = UTType.jpeg.identifier
         let mockImageSourceWriter = MockImageSourceWriter()
         let exporter = MediaImageExporter(data: mockData,
                                           filename: filename,
diff --git a/Yosemite/YosemiteTests/Tools/Media/URL+MediaTests.swift b/Yosemite/YosemiteTests/Tools/Media/URL+MediaTests.swift
index 5ccc90351f1..5208faff002 100644
--- a/Yosemite/YosemiteTests/Tools/Media/URL+MediaTests.swift
+++ b/Yosemite/YosemiteTests/Tools/Media/URL+MediaTests.swift
@@ -1,5 +1,6 @@
 import MobileCoreServices
 import XCTest
+import UniformTypeIdentifiers
 @testable import Yosemite
 
 final class URL_MediaTests: XCTestCase {
@@ -38,16 +39,16 @@ final class URL_MediaTests: XCTestCase {
 
     func testFileExtensionForJPEGType() {
         let expectedFileExtension = "jpeg"
-        XCTAssertEqual(URL.fileExtensionForUTType(kUTTypeJPEG as String), expectedFileExtension)
+        XCTAssertEqual(URL.fileExtensionForUTType(UTType.jpeg.identifier), expectedFileExtension)
     }
 
     func testFileExtensionForGIFType() {
         let expectedFileExtension = "gif"
-        XCTAssertEqual(URL.fileExtensionForUTType(kUTTypeGIF as String), expectedFileExtension)
+        XCTAssertEqual(URL.fileExtensionForUTType(UTType.gif.identifier), expectedFileExtension)
     }
 
     func testFileExtensionForPNGType() {
         let expectedFileExtension = "png"
-        XCTAssertEqual(URL.fileExtensionForUTType(kUTTypePNG as String), expectedFileExtension)
+        XCTAssertEqual(URL.fileExtensionForUTType(UTType.png.identifier), expectedFileExtension)
     }
 }