diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
index 28222e8..62122d4 100644
--- a/Example/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Example/Pods/Pods.xcodeproj/project.pbxproj
@@ -7,57 +7,57 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		00703477D03E535E1BFA3A7169814C2C /* PDFAnnotationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68ECDBCA8C7CBFC7A4C746BEAA00756 /* PDFAnnotationStore.swift */; };
-		0168C787039F39EFC7CC717928780ECE /* PDFFormField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EC48780BD915E4D5ACCE82C88A1AB13 /* PDFFormField.swift */; };
-		026FEED112A93B09A02BE58F8F025312 /* PDFPageScrubberThumb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43266A476FB5C6ADDCCBECEB16E9D513 /* PDFPageScrubberThumb.swift */; };
-		02F91569195B82122C93CD73F89BF123 /* PDFDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* PDFDocument.swift */; };
-		075383BD36B769E863ED5F59FA08F555 /* PDFPathAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9875B88D900C485C9301E8616F19BC5 /* PDFPathAnnotation.swift */; };
-		14E3AEB11DD6ED3800CC9C60 /* PDFSinglePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E3AEB01DD6ED3800CC9C60 /* PDFSinglePageCell.swift */; };
-		14ED9AA74A5A2E807B36B928AAE04F32 /* PDFTextAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36255D8C8E8839365B8EB3FF153756B5 /* PDFTextAnnotation.swift */; };
-		1A6C84063FC233E27AEA75D7300DFD96 /* PDFFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E445E04379E4222CB9A066D36A01E7C /* PDFFormViewController.swift */; };
-		27F938F715132EBBE5F6903A0029CA2B /* PDFDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0671AD3DB0F8A78F7FA1753FD4D804 /* PDFDictionary.swift */; };
-		298424542AE0A9D498FF405DFA338D75 /* PDFSnapshotCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9FE943FC9A290F6F65198FF53EF96E6 /* PDFSnapshotCache.swift */; };
+		00703477D03E535E1BFA3A7169814C2C /* UXMAnnotationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68ECDBCA8C7CBFC7A4C746BEAA00756 /* UXMAnnotationStore.swift */; };
+		0168C787039F39EFC7CC717928780ECE /* UXMFormField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EC48780BD915E4D5ACCE82C88A1AB13 /* UXMFormField.swift */; };
+		026FEED112A93B09A02BE58F8F025312 /* UXMPageScrubberThumb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43266A476FB5C6ADDCCBECEB16E9D513 /* UXMPageScrubberThumb.swift */; };
+		02F91569195B82122C93CD73F89BF123 /* UXMPDFDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* UXMPDFDocument.swift */; };
+		075383BD36B769E863ED5F59FA08F555 /* UXMPathAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9875B88D900C485C9301E8616F19BC5 /* UXMPathAnnotation.swift */; };
+		14E3AEB11DD6ED3800CC9C60 /* UXMSinglePageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E3AEB01DD6ED3800CC9C60 /* UXMSinglePageCell.swift */; };
+		14ED9AA74A5A2E807B36B928AAE04F32 /* UXMTextAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36255D8C8E8839365B8EB3FF153756B5 /* UXMTextAnnotation.swift */; };
+		1A6C84063FC233E27AEA75D7300DFD96 /* UXMFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E445E04379E4222CB9A066D36A01E7C /* UXMFormViewController.swift */; };
+		27F938F715132EBBE5F6903A0029CA2B /* UXMDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F0671AD3DB0F8A78F7FA1753FD4D804 /* UXMDictionary.swift */; };
+		298424542AE0A9D498FF405DFA338D75 /* UXMSnapshotCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9FE943FC9A290F6F65198FF53EF96E6 /* UXMSnapshotCache.swift */; };
 		3718081077F2A6A3CB9DB4259C52A9A6 /* UXMPDFKit.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 36816B3ABA7674FDDFE94F22C8EC3FAB /* UXMPDFKit.bundle */; };
-		37C1CD56A692371828740DFCEE4A9128 /* PDFViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C998B073AF0AE6121E63EFF482E2E251 /* PDFViewController.swift */; };
+		37C1CD56A692371828740DFCEE4A9128 /* UXMPDFViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C998B073AF0AE6121E63EFF482E2E251 /* UXMPDFViewController.swift */; };
 		38629AF01DDA548700DF2B43 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38629AEF1DDA548700DF2B43 /* UIColor.swift */; };
-		38629AF21DDA55DF00DF2B43 /* PDFToggleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38629AF11DDA55DF00DF2B43 /* PDFToggleButton.swift */; };
-		4226B8E079C7A46273F41F374F2D54EB /* PDFDocumentLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49FB5E98854EBDE8CCAB4C0137D1986 /* PDFDocumentLink.swift */; };
+		38629AF21DDA55DF00DF2B43 /* UXMToggleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38629AF11DDA55DF00DF2B43 /* UXMToggleButton.swift */; };
+		4226B8E079C7A46273F41F374F2D54EB /* UXMDocumentLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = E49FB5E98854EBDE8CCAB4C0137D1986 /* UXMDocumentLink.swift */; };
 		4431B8FC918BE6C9C21DCC72EDA860E6 /* Pods-UXMPDFKit_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 73B9DE7CB16631F30FAE38D53282A2FE /* Pods-UXMPDFKit_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4B1F57EBF4BECAEC47EEF57BD3CA1AD7 /* PDFAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69FD1010A27EE6442B7768D3B955DBF9 /* PDFAction.swift */; };
+		4B1F57EBF4BECAEC47EEF57BD3CA1AD7 /* UXMAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69FD1010A27EE6442B7768D3B955DBF9 /* UXMAction.swift */; };
 		4DFC30C056451573A629F3EA2C9378B7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C22425B0A3F84BE18A46849E29C823A0 /* Images.xcassets */; };
-		536A83F7FA72186229EBF285914A5B78 /* PDFThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C164216F04F2C8E8102F383F660F44 /* PDFThumbnailView.swift */; };
+		536A83F7FA72186229EBF285914A5B78 /* UXMThumbnailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C164216F04F2C8E8102F383F660F44 /* UXMThumbnailView.swift */; };
 		610688731E3A52BD00A85AF0 /* UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 610688711E3A4F9900A85AF0 /* UIViewController.swift */; };
 		612E003F1E424A9E00C42D3E /* CGPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612E003D1E424A7200C42D3E /* CGPoint.swift */; };
 		612E00421E424F3E00C42D3E /* CGRect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 612E00401E424EBF00C42D3E /* CGRect.swift */; };
-		61561CB41DDA7C6100C314EB /* PDFThumbnailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61561CB21DDA7B4E00C314EB /* PDFThumbnailViewController.swift */; };
-		61561CB61DDA7F6200C314EB /* PDFThumbnailViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61561CB51DDA7F6200C314EB /* PDFThumbnailViewCell.swift */; };
+		61561CB41DDA7C6100C314EB /* UXMThumbnailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61561CB21DDA7B4E00C314EB /* UXMThumbnailViewController.swift */; };
+		61561CB61DDA7F6200C314EB /* UXMThumbnailViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61561CB51DDA7F6200C314EB /* UXMThumbnailViewCell.swift */; };
 		61C3A26E1EC2859A00807C4B /* ResizeableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C3A26D1EC2859A00807C4B /* ResizeableView.swift */; };
-		61D72DBD1DDB705B003CE472 /* PDFActionURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DBC1DDB705B003CE472 /* PDFActionURL.swift */; };
-		61D72DBE1DDB7062003CE472 /* PDFActionGoTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DBA1DDB7039003CE472 /* PDFActionGoTo.swift */; };
-		61D72DC11DDB7C15003CE472 /* PDFTextParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DC01DDB7C15003CE472 /* PDFTextParser.swift */; };
+		61D72DBD1DDB705B003CE472 /* UXMActionURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DBC1DDB705B003CE472 /* UXMActionURL.swift */; };
+		61D72DBE1DDB7062003CE472 /* UXMActionGoTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DBA1DDB7039003CE472 /* UXMActionGoTo.swift */; };
+		61D72DC11DDB7C15003CE472 /* UXMTextParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D72DC01DDB7C15003CE472 /* UXMTextParser.swift */; };
 		6CBA8437445A566C49E81E0FA15F8B89 /* Pods-UXMPDFKit_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = EF5680F0C21DEB74F7B47666298F36DB /* Pods-UXMPDFKit_Example-dummy.m */; };
-		75332EB7DF07634FEBA4DB30AED834DE /* PDFBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1A9EB3AA234A93FFED5E5EC31C26C0 /* PDFBarButton.swift */; };
-		75EBCC5DA128D1197EE38C0D71ED2E61 /* PDFSinglePageViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F33BD08506077733D10565FD32AAE01D /* PDFSinglePageViewer.swift */; };
+		75332EB7DF07634FEBA4DB30AED834DE /* UXMBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1A9EB3AA234A93FFED5E5EC31C26C0 /* UXMBarButton.swift */; };
+		75EBCC5DA128D1197EE38C0D71ED2E61 /* UXMSinglePageViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F33BD08506077733D10565FD32AAE01D /* UXMSinglePageViewer.swift */; };
 		A541F16F605856534EE1CB630D115E97 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */; };
 		AEBCD8510D17EB5BB1AF97C56DA3E0A4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */; };
-		B564F9589CA9317A04F24F9DC40AC5AA /* PDFAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46276AA25C0911175B06F6F426E499D5 /* PDFAnnotation.swift */; };
-		B6610EC0BB6FC688BE01E6A0CEDAC1E8 /* PDFPageScrubber.swift in Sources */ = {isa = PBXBuildFile; fileRef = C690BCEDB59958B45834FDDEEF382E58 /* PDFPageScrubber.swift */; };
-		C02189E300C9F94935CFF78ECD34CA3B /* PDFPageTileLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1C7B951EC7E6CED0390CF07A023630 /* PDFPageTileLayer.swift */; };
-		C1EDA6F9A885F21D2887845369237062 /* PDFArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64082BD427D609690F7BB6818051DE3D /* PDFArray.swift */; };
-		C4E224C0D0BFCC63723ACA2EDB266CC6 /* PDFFormButtonField.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4C067E14A9564492BD5FDF5871991B /* PDFFormButtonField.swift */; };
-		C4ECF8B8556E26A1DF679C202AC9B641 /* PDFFormSignatureField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86698FA335844AF90C62A0038C5B4B9C /* PDFFormSignatureField.swift */; };
-		CC2919A41AAA5F6BCC83D700E574345F /* PDFObjectParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71407B9D27B023DFC53AEEA70B040CB /* PDFObjectParser.swift */; };
-		CE63E30770B2CDD35ED208AF2A284F5B /* PDFPageContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C363DF92B0BB7081898E123695AED3A2 /* PDFPageContent.swift */; };
-		D09FB06765B5FCD7A81F58BE68B1BDED /* PDFRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7D9346501AFA05A330677D39DB1650F /* PDFRenderer.swift */; };
-		DD3034BF3EE6DA6D91BBF74EAEAC456E /* PDFFormPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315197F935F69EEBFF1F92849523A564 /* PDFFormPageView.swift */; };
+		B564F9589CA9317A04F24F9DC40AC5AA /* UXMAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46276AA25C0911175B06F6F426E499D5 /* UXMAnnotation.swift */; };
+		B6610EC0BB6FC688BE01E6A0CEDAC1E8 /* UXMPageScrubber.swift in Sources */ = {isa = PBXBuildFile; fileRef = C690BCEDB59958B45834FDDEEF382E58 /* UXMPageScrubber.swift */; };
+		C02189E300C9F94935CFF78ECD34CA3B /* UXMPageTileLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1C7B951EC7E6CED0390CF07A023630 /* UXMPageTileLayer.swift */; };
+		C1EDA6F9A885F21D2887845369237062 /* UXMArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64082BD427D609690F7BB6818051DE3D /* UXMArray.swift */; };
+		C4E224C0D0BFCC63723ACA2EDB266CC6 /* UXMFormButtonField.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB4C067E14A9564492BD5FDF5871991B /* UXMFormButtonField.swift */; };
+		C4ECF8B8556E26A1DF679C202AC9B641 /* UXMFormSignatureField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86698FA335844AF90C62A0038C5B4B9C /* UXMFormSignatureField.swift */; };
+		CC2919A41AAA5F6BCC83D700E574345F /* UXMObjectParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71407B9D27B023DFC53AEEA70B040CB /* UXMObjectParser.swift */; };
+		CE63E30770B2CDD35ED208AF2A284F5B /* UXMPageContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = C363DF92B0BB7081898E123695AED3A2 /* UXMPageContent.swift */; };
+		D09FB06765B5FCD7A81F58BE68B1BDED /* UXMRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7D9346501AFA05A330677D39DB1650F /* UXMRenderer.swift */; };
+		DD3034BF3EE6DA6D91BBF74EAEAC456E /* UXMFormPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 315197F935F69EEBFF1F92849523A564 /* UXMFormPageView.swift */; };
 		DE4A344370F68EA63CCA245BB42FF44A /* UXMPDFKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 38A6B7046D88F318BCDF67B75969CABF /* UXMPDFKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEEE49CA145C9CAFCB54635C31D6F6E6 /* CGPDFDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76DA813643EF21961CF0953E75AD135F /* CGPDFDocument.swift */; };
-		E2EE8D087924795726295ABA80B0079F /* PDFPageScrubberTrackControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC4678DC63259E1E556B22354639F826 /* PDFPageScrubberTrackControl.swift */; };
-		E8C31B918E22C5EB41B659A64E076416 /* PDFAnnotationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9731359E2EA43A65C0297BACA691EFDC /* PDFAnnotationController.swift */; };
+		E2EE8D087924795726295ABA80B0079F /* UXMPageScrubberTrackControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC4678DC63259E1E556B22354639F826 /* UXMPageScrubberTrackControl.swift */; };
+		E8C31B918E22C5EB41B659A64E076416 /* UXMAnnotationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9731359E2EA43A65C0297BACA691EFDC /* UXMAnnotationController.swift */; };
 		EA02320D912547EAE5017330C7835B18 /* UXMPDFKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC32D4C69A270C7F52DFE49BEE6E162 /* UXMPDFKit-dummy.m */; };
 		EF0C3B060264BDE888EFCB98B2E95088 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EF790A1D01AB3417430203D9D7EFB14 /* UIImage.swift */; };
-		F77D80C31A9B9DBED9D3A258932F9922 /* PDFPageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A494B21C53F5EAC8E75CE8E354CAF951 /* PDFPageContentView.swift */; };
-		F9C1E676BBEAC0A22212CD00437C1073 /* PDFFormTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83C4D21E86A879510E1AA0F444C9882 /* PDFFormTextField.swift */; };
+		F77D80C31A9B9DBED9D3A258932F9922 /* UXMPageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A494B21C53F5EAC8E75CE8E354CAF951 /* UXMPageContentView.swift */; };
+		F9C1E676BBEAC0A22212CD00437C1073 /* UXMFormTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83C4D21E86A879510E1AA0F444C9882 /* UXMFormTextField.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -80,70 +80,70 @@
 /* Begin PBXFileReference section */
 		0E25E22600004B87F1FD6DE65F353057 /* Pods_UXMPDFKit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_UXMPDFKit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0EF790A1D01AB3417430203D9D7EFB14 /* UIImage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = "<group>"; };
-		14E3AEB01DD6ED3800CC9C60 /* PDFSinglePageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFSinglePageCell.swift; sourceTree = "<group>"; };
-		2E445E04379E4222CB9A066D36A01E7C /* PDFFormViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormViewController.swift; sourceTree = "<group>"; };
-		315197F935F69EEBFF1F92849523A564 /* PDFFormPageView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormPageView.swift; sourceTree = "<group>"; };
-		36255D8C8E8839365B8EB3FF153756B5 /* PDFTextAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFTextAnnotation.swift; sourceTree = "<group>"; };
+		14E3AEB01DD6ED3800CC9C60 /* UXMSinglePageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMSinglePageCell.swift; sourceTree = "<group>"; };
+		2E445E04379E4222CB9A066D36A01E7C /* UXMFormViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormViewController.swift; sourceTree = "<group>"; };
+		315197F935F69EEBFF1F92849523A564 /* UXMFormPageView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormPageView.swift; sourceTree = "<group>"; };
+		36255D8C8E8839365B8EB3FF153756B5 /* UXMTextAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMTextAnnotation.swift; sourceTree = "<group>"; };
 		36816B3ABA7674FDDFE94F22C8EC3FAB /* UXMPDFKit.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UXMPDFKit.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		38629AEF1DDA548700DF2B43 /* UIColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIColor.swift; sourceTree = "<group>"; };
-		38629AF11DDA55DF00DF2B43 /* PDFToggleButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFToggleButton.swift; sourceTree = "<group>"; };
+		38629AF11DDA55DF00DF2B43 /* UXMToggleButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMToggleButton.swift; sourceTree = "<group>"; };
 		38A6B7046D88F318BCDF67B75969CABF /* UXMPDFKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UXMPDFKit-umbrella.h"; sourceTree = "<group>"; };
 		3CC32D4C69A270C7F52DFE49BEE6E162 /* UXMPDFKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UXMPDFKit-dummy.m"; sourceTree = "<group>"; };
-		43266A476FB5C6ADDCCBECEB16E9D513 /* PDFPageScrubberThumb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageScrubberThumb.swift; sourceTree = "<group>"; };
-		46276AA25C0911175B06F6F426E499D5 /* PDFAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFAnnotation.swift; sourceTree = "<group>"; };
-		4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* PDFDocument.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFDocument.swift; sourceTree = "<group>"; };
+		43266A476FB5C6ADDCCBECEB16E9D513 /* UXMPageScrubberThumb.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageScrubberThumb.swift; sourceTree = "<group>"; };
+		46276AA25C0911175B06F6F426E499D5 /* UXMAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMAnnotation.swift; sourceTree = "<group>"; };
+		4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* UXMPDFDocument.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPDFDocument.swift; sourceTree = "<group>"; };
 		610688711E3A4F9900A85AF0 /* UIViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewController.swift; sourceTree = "<group>"; };
 		612E003D1E424A7200C42D3E /* CGPoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGPoint.swift; sourceTree = "<group>"; };
 		612E00401E424EBF00C42D3E /* CGRect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGRect.swift; sourceTree = "<group>"; };
 		614525CCFB2767D95FE12EEEC2FD622C /* UXMPDFKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "UXMPDFKit-prefix.pch"; sourceTree = "<group>"; };
-		61561CB21DDA7B4E00C314EB /* PDFThumbnailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFThumbnailViewController.swift; sourceTree = "<group>"; };
-		61561CB51DDA7F6200C314EB /* PDFThumbnailViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFThumbnailViewCell.swift; sourceTree = "<group>"; };
+		61561CB21DDA7B4E00C314EB /* UXMThumbnailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMThumbnailViewController.swift; sourceTree = "<group>"; };
+		61561CB51DDA7F6200C314EB /* UXMThumbnailViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMThumbnailViewCell.swift; sourceTree = "<group>"; };
 		61C3A26D1EC2859A00807C4B /* ResizeableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResizeableView.swift; sourceTree = "<group>"; };
-		61D72DBA1DDB7039003CE472 /* PDFActionGoTo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFActionGoTo.swift; sourceTree = "<group>"; };
-		61D72DBC1DDB705B003CE472 /* PDFActionURL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFActionURL.swift; sourceTree = "<group>"; };
-		61D72DC01DDB7C15003CE472 /* PDFTextParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFTextParser.swift; sourceTree = "<group>"; };
-		64082BD427D609690F7BB6818051DE3D /* PDFArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFArray.swift; sourceTree = "<group>"; };
-		69FD1010A27EE6442B7768D3B955DBF9 /* PDFAction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFAction.swift; sourceTree = "<group>"; };
-		6EC48780BD915E4D5ACCE82C88A1AB13 /* PDFFormField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormField.swift; sourceTree = "<group>"; };
+		61D72DBA1DDB7039003CE472 /* UXMActionGoTo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMActionGoTo.swift; sourceTree = "<group>"; };
+		61D72DBC1DDB705B003CE472 /* UXMActionURL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMActionURL.swift; sourceTree = "<group>"; };
+		61D72DC01DDB7C15003CE472 /* UXMTextParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UXMTextParser.swift; sourceTree = "<group>"; };
+		64082BD427D609690F7BB6818051DE3D /* UXMArray.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMArray.swift; sourceTree = "<group>"; };
+		69FD1010A27EE6442B7768D3B955DBF9 /* UXMAction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMAction.swift; sourceTree = "<group>"; };
+		6EC48780BD915E4D5ACCE82C88A1AB13 /* UXMFormField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormField.swift; sourceTree = "<group>"; };
 		73B9DE7CB16631F30FAE38D53282A2FE /* Pods-UXMPDFKit_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-UXMPDFKit_Example-umbrella.h"; sourceTree = "<group>"; };
 		75574BE886F738F3093CE3A2F50EDEC8 /* Pods-UXMPDFKit_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-UXMPDFKit_Example-acknowledgements.markdown"; sourceTree = "<group>"; };
 		76DA813643EF21961CF0953E75AD135F /* CGPDFDocument.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CGPDFDocument.swift; sourceTree = "<group>"; };
-		7F0671AD3DB0F8A78F7FA1753FD4D804 /* PDFDictionary.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFDictionary.swift; sourceTree = "<group>"; };
+		7F0671AD3DB0F8A78F7FA1753FD4D804 /* UXMDictionary.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMDictionary.swift; sourceTree = "<group>"; };
 		84EF34252AF2C6686B91CF82C433AF97 /* Pods-UXMPDFKit_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-UXMPDFKit_Example-resources.sh"; sourceTree = "<group>"; };
-		86698FA335844AF90C62A0038C5B4B9C /* PDFFormSignatureField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormSignatureField.swift; sourceTree = "<group>"; };
+		86698FA335844AF90C62A0038C5B4B9C /* UXMFormSignatureField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormSignatureField.swift; sourceTree = "<group>"; };
 		923C8A6AA6EF26F1AFCE47B4B4307540 /* Pods-UXMPDFKit_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-UXMPDFKit_Example.modulemap"; sourceTree = "<group>"; };
 		93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
-		9731359E2EA43A65C0297BACA691EFDC /* PDFAnnotationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFAnnotationController.swift; sourceTree = "<group>"; };
+		9731359E2EA43A65C0297BACA691EFDC /* UXMAnnotationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMAnnotationController.swift; sourceTree = "<group>"; };
 		98269C964ED3DBB303CBAA1006CEE6AC /* Pods-UXMPDFKit_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-UXMPDFKit_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		A0181833A6A33E2F39D632638FA039C1 /* UXMPDFKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = UXMPDFKit.modulemap; sourceTree = "<group>"; };
 		A4813EE89CCCB14693E9B61A6CD6117F /* UXMPDFKit.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = UXMPDFKit.xcconfig; sourceTree = "<group>"; };
-		A494B21C53F5EAC8E75CE8E354CAF951 /* PDFPageContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageContentView.swift; sourceTree = "<group>"; };
+		A494B21C53F5EAC8E75CE8E354CAF951 /* UXMPageContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageContentView.swift; sourceTree = "<group>"; };
 		A599D61A3B46FD09E6025DE6E91F8D66 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		A83C4D21E86A879510E1AA0F444C9882 /* PDFFormTextField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormTextField.swift; sourceTree = "<group>"; };
+		A83C4D21E86A879510E1AA0F444C9882 /* UXMFormTextField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormTextField.swift; sourceTree = "<group>"; };
 		A96B3532B35536E9DE978DE5DE13E668 /* ResourceBundle-UXMPDFKit-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ResourceBundle-UXMPDFKit-Info.plist"; sourceTree = "<group>"; };
-		AE1C7B951EC7E6CED0390CF07A023630 /* PDFPageTileLayer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageTileLayer.swift; sourceTree = "<group>"; };
-		B68ECDBCA8C7CBFC7A4C746BEAA00756 /* PDFAnnotationStore.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFAnnotationStore.swift; sourceTree = "<group>"; };
-		B7D9346501AFA05A330677D39DB1650F /* PDFRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFRenderer.swift; sourceTree = "<group>"; };
-		B9875B88D900C485C9301E8616F19BC5 /* PDFPathAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPathAnnotation.swift; sourceTree = "<group>"; };
-		BC1A9EB3AA234A93FFED5E5EC31C26C0 /* PDFBarButton.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFBarButton.swift; sourceTree = "<group>"; };
+		AE1C7B951EC7E6CED0390CF07A023630 /* UXMPageTileLayer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageTileLayer.swift; sourceTree = "<group>"; };
+		B68ECDBCA8C7CBFC7A4C746BEAA00756 /* UXMAnnotationStore.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMAnnotationStore.swift; sourceTree = "<group>"; };
+		B7D9346501AFA05A330677D39DB1650F /* UXMRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMRenderer.swift; sourceTree = "<group>"; };
+		B9875B88D900C485C9301E8616F19BC5 /* UXMPathAnnotation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPathAnnotation.swift; sourceTree = "<group>"; };
+		BC1A9EB3AA234A93FFED5E5EC31C26C0 /* UXMBarButton.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMBarButton.swift; sourceTree = "<group>"; };
 		C22425B0A3F84BE18A46849E29C823A0 /* Images.xcassets */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
-		C363DF92B0BB7081898E123695AED3A2 /* PDFPageContent.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageContent.swift; sourceTree = "<group>"; };
+		C363DF92B0BB7081898E123695AED3A2 /* UXMPageContent.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageContent.swift; sourceTree = "<group>"; };
 		C427B08E12D2A5801438BEBFC96520BD /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		C690BCEDB59958B45834FDDEEF382E58 /* PDFPageScrubber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageScrubber.swift; sourceTree = "<group>"; };
-		C6C164216F04F2C8E8102F383F660F44 /* PDFThumbnailView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFThumbnailView.swift; sourceTree = "<group>"; };
-		C71407B9D27B023DFC53AEEA70B040CB /* PDFObjectParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFObjectParser.swift; sourceTree = "<group>"; };
-		C998B073AF0AE6121E63EFF482E2E251 /* PDFViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFViewController.swift; sourceTree = "<group>"; };
-		C9FE943FC9A290F6F65198FF53EF96E6 /* PDFSnapshotCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFSnapshotCache.swift; sourceTree = "<group>"; };
+		C690BCEDB59958B45834FDDEEF382E58 /* UXMPageScrubber.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageScrubber.swift; sourceTree = "<group>"; };
+		C6C164216F04F2C8E8102F383F660F44 /* UXMThumbnailView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMThumbnailView.swift; sourceTree = "<group>"; };
+		C71407B9D27B023DFC53AEEA70B040CB /* UXMObjectParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMObjectParser.swift; sourceTree = "<group>"; };
+		C998B073AF0AE6121E63EFF482E2E251 /* UXMPDFViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPDFViewController.swift; sourceTree = "<group>"; };
+		C9FE943FC9A290F6F65198FF53EF96E6 /* UXMSnapshotCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMSnapshotCache.swift; sourceTree = "<group>"; };
 		CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		CF95F142877C93B0BAB858F7187F7D1C /* Pods-UXMPDFKit_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-UXMPDFKit_Example.release.xcconfig"; sourceTree = "<group>"; };
 		D7B61F1F28653D99DFE37D252E1BD160 /* Pods-UXMPDFKit_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-UXMPDFKit_Example-acknowledgements.plist"; sourceTree = "<group>"; };
-		E49FB5E98854EBDE8CCAB4C0137D1986 /* PDFDocumentLink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFDocumentLink.swift; sourceTree = "<group>"; };
+		E49FB5E98854EBDE8CCAB4C0137D1986 /* UXMDocumentLink.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMDocumentLink.swift; sourceTree = "<group>"; };
 		EC338060A25E46404C16949C136E122D /* UXMPDFKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UXMPDFKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		EC4678DC63259E1E556B22354639F826 /* PDFPageScrubberTrackControl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFPageScrubberTrackControl.swift; sourceTree = "<group>"; };
+		EC4678DC63259E1E556B22354639F826 /* UXMPageScrubberTrackControl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMPageScrubberTrackControl.swift; sourceTree = "<group>"; };
 		EF5680F0C21DEB74F7B47666298F36DB /* Pods-UXMPDFKit_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-UXMPDFKit_Example-dummy.m"; sourceTree = "<group>"; };
-		F33BD08506077733D10565FD32AAE01D /* PDFSinglePageViewer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFSinglePageViewer.swift; sourceTree = "<group>"; };
+		F33BD08506077733D10565FD32AAE01D /* UXMSinglePageViewer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMSinglePageViewer.swift; sourceTree = "<group>"; };
 		F5E1EF2045F8CAE079FBBD1B47009647 /* Pods-UXMPDFKit_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-UXMPDFKit_Example-frameworks.sh"; sourceTree = "<group>"; };
-		FB4C067E14A9564492BD5FDF5871991B /* PDFFormButtonField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PDFFormButtonField.swift; sourceTree = "<group>"; };
+		FB4C067E14A9564492BD5FDF5871991B /* UXMFormButtonField.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UXMFormButtonField.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -202,11 +202,11 @@
 		0D5534176FDA413966A2FA057AB7673C /* Annotations */ = {
 			isa = PBXGroup;
 			children = (
-				46276AA25C0911175B06F6F426E499D5 /* PDFAnnotation.swift */,
-				9731359E2EA43A65C0297BACA691EFDC /* PDFAnnotationController.swift */,
-				B68ECDBCA8C7CBFC7A4C746BEAA00756 /* PDFAnnotationStore.swift */,
-				B9875B88D900C485C9301E8616F19BC5 /* PDFPathAnnotation.swift */,
-				36255D8C8E8839365B8EB3FF153756B5 /* PDFTextAnnotation.swift */,
+				46276AA25C0911175B06F6F426E499D5 /* UXMAnnotation.swift */,
+				9731359E2EA43A65C0297BACA691EFDC /* UXMAnnotationController.swift */,
+				B68ECDBCA8C7CBFC7A4C746BEAA00756 /* UXMAnnotationStore.swift */,
+				B9875B88D900C485C9301E8616F19BC5 /* UXMPathAnnotation.swift */,
+				36255D8C8E8839365B8EB3FF153756B5 /* UXMTextAnnotation.swift */,
 			);
 			path = Annotations;
 			sourceTree = "<group>";
@@ -226,16 +226,16 @@
 		2267295D4FF13F19ED68658643D87819 /* Form */ = {
 			isa = PBXGroup;
 			children = (
-				64082BD427D609690F7BB6818051DE3D /* PDFArray.swift */,
-				7F0671AD3DB0F8A78F7FA1753FD4D804 /* PDFDictionary.swift */,
-				FB4C067E14A9564492BD5FDF5871991B /* PDFFormButtonField.swift */,
-				6EC48780BD915E4D5ACCE82C88A1AB13 /* PDFFormField.swift */,
-				315197F935F69EEBFF1F92849523A564 /* PDFFormPageView.swift */,
-				86698FA335844AF90C62A0038C5B4B9C /* PDFFormSignatureField.swift */,
-				A83C4D21E86A879510E1AA0F444C9882 /* PDFFormTextField.swift */,
-				2E445E04379E4222CB9A066D36A01E7C /* PDFFormViewController.swift */,
-				C71407B9D27B023DFC53AEEA70B040CB /* PDFObjectParser.swift */,
-				38629AF11DDA55DF00DF2B43 /* PDFToggleButton.swift */,
+				64082BD427D609690F7BB6818051DE3D /* UXMArray.swift */,
+				7F0671AD3DB0F8A78F7FA1753FD4D804 /* UXMDictionary.swift */,
+				FB4C067E14A9564492BD5FDF5871991B /* UXMFormButtonField.swift */,
+				6EC48780BD915E4D5ACCE82C88A1AB13 /* UXMFormField.swift */,
+				315197F935F69EEBFF1F92849523A564 /* UXMFormPageView.swift */,
+				86698FA335844AF90C62A0038C5B4B9C /* UXMFormSignatureField.swift */,
+				A83C4D21E86A879510E1AA0F444C9882 /* UXMFormTextField.swift */,
+				2E445E04379E4222CB9A066D36A01E7C /* UXMFormViewController.swift */,
+				C71407B9D27B023DFC53AEEA70B040CB /* UXMObjectParser.swift */,
+				38629AF11DDA55DF00DF2B43 /* UXMToggleButton.swift */,
 			);
 			path = Form;
 			sourceTree = "<group>";
@@ -260,22 +260,22 @@
 			isa = PBXGroup;
 			children = (
 				76DA813643EF21961CF0953E75AD135F /* CGPDFDocument.swift */,
-				4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* PDFDocument.swift */,
-				E49FB5E98854EBDE8CCAB4C0137D1986 /* PDFDocumentLink.swift */,
-				C363DF92B0BB7081898E123695AED3A2 /* PDFPageContent.swift */,
-				A494B21C53F5EAC8E75CE8E354CAF951 /* PDFPageContentView.swift */,
-				C690BCEDB59958B45834FDDEEF382E58 /* PDFPageScrubber.swift */,
-				43266A476FB5C6ADDCCBECEB16E9D513 /* PDFPageScrubberThumb.swift */,
-				EC4678DC63259E1E556B22354639F826 /* PDFPageScrubberTrackControl.swift */,
-				AE1C7B951EC7E6CED0390CF07A023630 /* PDFPageTileLayer.swift */,
-				B7D9346501AFA05A330677D39DB1650F /* PDFRenderer.swift */,
-				14E3AEB01DD6ED3800CC9C60 /* PDFSinglePageCell.swift */,
-				F33BD08506077733D10565FD32AAE01D /* PDFSinglePageViewer.swift */,
-				C9FE943FC9A290F6F65198FF53EF96E6 /* PDFSnapshotCache.swift */,
-				C6C164216F04F2C8E8102F383F660F44 /* PDFThumbnailView.swift */,
-				61561CB21DDA7B4E00C314EB /* PDFThumbnailViewController.swift */,
-				61561CB51DDA7F6200C314EB /* PDFThumbnailViewCell.swift */,
-				C998B073AF0AE6121E63EFF482E2E251 /* PDFViewController.swift */,
+				4E1B16E7B9A2A6B1300E0AE0B3DD0ED6 /* UXMPDFDocument.swift */,
+				E49FB5E98854EBDE8CCAB4C0137D1986 /* UXMDocumentLink.swift */,
+				C363DF92B0BB7081898E123695AED3A2 /* UXMPageContent.swift */,
+				A494B21C53F5EAC8E75CE8E354CAF951 /* UXMPageContentView.swift */,
+				C690BCEDB59958B45834FDDEEF382E58 /* UXMPageScrubber.swift */,
+				43266A476FB5C6ADDCCBECEB16E9D513 /* UXMPageScrubberThumb.swift */,
+				EC4678DC63259E1E556B22354639F826 /* UXMPageScrubberTrackControl.swift */,
+				AE1C7B951EC7E6CED0390CF07A023630 /* UXMPageTileLayer.swift */,
+				B7D9346501AFA05A330677D39DB1650F /* UXMRenderer.swift */,
+				14E3AEB01DD6ED3800CC9C60 /* UXMSinglePageCell.swift */,
+				F33BD08506077733D10565FD32AAE01D /* UXMSinglePageViewer.swift */,
+				C9FE943FC9A290F6F65198FF53EF96E6 /* UXMSnapshotCache.swift */,
+				C6C164216F04F2C8E8102F383F660F44 /* UXMThumbnailView.swift */,
+				61561CB21DDA7B4E00C314EB /* UXMThumbnailViewController.swift */,
+				61561CB51DDA7F6200C314EB /* UXMThumbnailViewCell.swift */,
+				C998B073AF0AE6121E63EFF482E2E251 /* UXMPDFViewController.swift */,
 			);
 			path = Renderer;
 			sourceTree = "<group>";
@@ -319,7 +319,7 @@
 		61C3A26F1EC3C0DF00807C4B /* View */ = {
 			isa = PBXGroup;
 			children = (
-				BC1A9EB3AA234A93FFED5E5EC31C26C0 /* PDFBarButton.swift */,
+				BC1A9EB3AA234A93FFED5E5EC31C26C0 /* UXMBarButton.swift */,
 				61C3A26D1EC2859A00807C4B /* ResizeableView.swift */,
 			);
 			path = View;
@@ -328,7 +328,7 @@
 		61D72DBF1DDB7BEF003CE472 /* TextParser */ = {
 			isa = PBXGroup;
 			children = (
-				61D72DC01DDB7C15003CE472 /* PDFTextParser.swift */,
+				61D72DC01DDB7C15003CE472 /* UXMTextParser.swift */,
 			);
 			path = TextParser;
 			sourceTree = "<group>";
@@ -355,9 +355,9 @@
 		81336BCA9643382D6508CC16CB35EE81 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				69FD1010A27EE6442B7768D3B955DBF9 /* PDFAction.swift */,
-				61D72DBA1DDB7039003CE472 /* PDFActionGoTo.swift */,
-				61D72DBC1DDB705B003CE472 /* PDFActionURL.swift */,
+				69FD1010A27EE6442B7768D3B955DBF9 /* UXMAction.swift */,
+				61D72DBA1DDB7039003CE472 /* UXMActionGoTo.swift */,
+				61D72DBC1DDB705B003CE472 /* UXMActionURL.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -491,8 +491,11 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0900;
 				TargetAttributes = {
+					806AC9F20336348B8F1E6138E470491D = {
+						LastSwiftMigration = 0900;
+					};
 					D7C77B95095598F2FFA1E9456D29905E = {
 						LastSwiftMigration = 0820;
 					};
@@ -557,48 +560,48 @@
 			buildActionMask = 2147483647;
 			files = (
 				DEEE49CA145C9CAFCB54635C31D6F6E6 /* CGPDFDocument.swift in Sources */,
-				4B1F57EBF4BECAEC47EEF57BD3CA1AD7 /* PDFAction.swift in Sources */,
-				B564F9589CA9317A04F24F9DC40AC5AA /* PDFAnnotation.swift in Sources */,
-				E8C31B918E22C5EB41B659A64E076416 /* PDFAnnotationController.swift in Sources */,
-				61D72DBD1DDB705B003CE472 /* PDFActionURL.swift in Sources */,
-				00703477D03E535E1BFA3A7169814C2C /* PDFAnnotationStore.swift in Sources */,
-				C1EDA6F9A885F21D2887845369237062 /* PDFArray.swift in Sources */,
-				61561CB41DDA7C6100C314EB /* PDFThumbnailViewController.swift in Sources */,
-				75332EB7DF07634FEBA4DB30AED834DE /* PDFBarButton.swift in Sources */,
-				27F938F715132EBBE5F6903A0029CA2B /* PDFDictionary.swift in Sources */,
+				4B1F57EBF4BECAEC47EEF57BD3CA1AD7 /* UXMAction.swift in Sources */,
+				B564F9589CA9317A04F24F9DC40AC5AA /* UXMAnnotation.swift in Sources */,
+				E8C31B918E22C5EB41B659A64E076416 /* UXMAnnotationController.swift in Sources */,
+				61D72DBD1DDB705B003CE472 /* UXMActionURL.swift in Sources */,
+				00703477D03E535E1BFA3A7169814C2C /* UXMAnnotationStore.swift in Sources */,
+				C1EDA6F9A885F21D2887845369237062 /* UXMArray.swift in Sources */,
+				61561CB41DDA7C6100C314EB /* UXMThumbnailViewController.swift in Sources */,
+				75332EB7DF07634FEBA4DB30AED834DE /* UXMBarButton.swift in Sources */,
+				27F938F715132EBBE5F6903A0029CA2B /* UXMDictionary.swift in Sources */,
 				612E003F1E424A9E00C42D3E /* CGPoint.swift in Sources */,
-				02F91569195B82122C93CD73F89BF123 /* PDFDocument.swift in Sources */,
+				02F91569195B82122C93CD73F89BF123 /* UXMPDFDocument.swift in Sources */,
 				610688731E3A52BD00A85AF0 /* UIViewController.swift in Sources */,
-				4226B8E079C7A46273F41F374F2D54EB /* PDFDocumentLink.swift in Sources */,
-				C4E224C0D0BFCC63723ACA2EDB266CC6 /* PDFFormButtonField.swift in Sources */,
-				0168C787039F39EFC7CC717928780ECE /* PDFFormField.swift in Sources */,
+				4226B8E079C7A46273F41F374F2D54EB /* UXMDocumentLink.swift in Sources */,
+				C4E224C0D0BFCC63723ACA2EDB266CC6 /* UXMFormButtonField.swift in Sources */,
+				0168C787039F39EFC7CC717928780ECE /* UXMFormField.swift in Sources */,
 				612E00421E424F3E00C42D3E /* CGRect.swift in Sources */,
-				61D72DC11DDB7C15003CE472 /* PDFTextParser.swift in Sources */,
-				14E3AEB11DD6ED3800CC9C60 /* PDFSinglePageCell.swift in Sources */,
-				DD3034BF3EE6DA6D91BBF74EAEAC456E /* PDFFormPageView.swift in Sources */,
-				61D72DBE1DDB7062003CE472 /* PDFActionGoTo.swift in Sources */,
-				C4ECF8B8556E26A1DF679C202AC9B641 /* PDFFormSignatureField.swift in Sources */,
-				F9C1E676BBEAC0A22212CD00437C1073 /* PDFFormTextField.swift in Sources */,
-				1A6C84063FC233E27AEA75D7300DFD96 /* PDFFormViewController.swift in Sources */,
+				61D72DC11DDB7C15003CE472 /* UXMTextParser.swift in Sources */,
+				14E3AEB11DD6ED3800CC9C60 /* UXMSinglePageCell.swift in Sources */,
+				DD3034BF3EE6DA6D91BBF74EAEAC456E /* UXMFormPageView.swift in Sources */,
+				61D72DBE1DDB7062003CE472 /* UXMActionGoTo.swift in Sources */,
+				C4ECF8B8556E26A1DF679C202AC9B641 /* UXMFormSignatureField.swift in Sources */,
+				F9C1E676BBEAC0A22212CD00437C1073 /* UXMFormTextField.swift in Sources */,
+				1A6C84063FC233E27AEA75D7300DFD96 /* UXMFormViewController.swift in Sources */,
 				61C3A26E1EC2859A00807C4B /* ResizeableView.swift in Sources */,
-				CC2919A41AAA5F6BCC83D700E574345F /* PDFObjectParser.swift in Sources */,
-				CE63E30770B2CDD35ED208AF2A284F5B /* PDFPageContent.swift in Sources */,
-				F77D80C31A9B9DBED9D3A258932F9922 /* PDFPageContentView.swift in Sources */,
-				B6610EC0BB6FC688BE01E6A0CEDAC1E8 /* PDFPageScrubber.swift in Sources */,
-				026FEED112A93B09A02BE58F8F025312 /* PDFPageScrubberThumb.swift in Sources */,
-				E2EE8D087924795726295ABA80B0079F /* PDFPageScrubberTrackControl.swift in Sources */,
+				CC2919A41AAA5F6BCC83D700E574345F /* UXMObjectParser.swift in Sources */,
+				CE63E30770B2CDD35ED208AF2A284F5B /* UXMPageContent.swift in Sources */,
+				F77D80C31A9B9DBED9D3A258932F9922 /* UXMPageContentView.swift in Sources */,
+				B6610EC0BB6FC688BE01E6A0CEDAC1E8 /* UXMPageScrubber.swift in Sources */,
+				026FEED112A93B09A02BE58F8F025312 /* UXMPageScrubberThumb.swift in Sources */,
+				E2EE8D087924795726295ABA80B0079F /* UXMPageScrubberTrackControl.swift in Sources */,
 				38629AF01DDA548700DF2B43 /* UIColor.swift in Sources */,
-				C02189E300C9F94935CFF78ECD34CA3B /* PDFPageTileLayer.swift in Sources */,
-				075383BD36B769E863ED5F59FA08F555 /* PDFPathAnnotation.swift in Sources */,
-				D09FB06765B5FCD7A81F58BE68B1BDED /* PDFRenderer.swift in Sources */,
-				75EBCC5DA128D1197EE38C0D71ED2E61 /* PDFSinglePageViewer.swift in Sources */,
-				38629AF21DDA55DF00DF2B43 /* PDFToggleButton.swift in Sources */,
-				298424542AE0A9D498FF405DFA338D75 /* PDFSnapshotCache.swift in Sources */,
-				14ED9AA74A5A2E807B36B928AAE04F32 /* PDFTextAnnotation.swift in Sources */,
-				536A83F7FA72186229EBF285914A5B78 /* PDFThumbnailView.swift in Sources */,
-				37C1CD56A692371828740DFCEE4A9128 /* PDFViewController.swift in Sources */,
+				C02189E300C9F94935CFF78ECD34CA3B /* UXMPageTileLayer.swift in Sources */,
+				075383BD36B769E863ED5F59FA08F555 /* UXMPathAnnotation.swift in Sources */,
+				D09FB06765B5FCD7A81F58BE68B1BDED /* UXMRenderer.swift in Sources */,
+				75EBCC5DA128D1197EE38C0D71ED2E61 /* UXMSinglePageViewer.swift in Sources */,
+				38629AF21DDA55DF00DF2B43 /* UXMToggleButton.swift in Sources */,
+				298424542AE0A9D498FF405DFA338D75 /* UXMSnapshotCache.swift in Sources */,
+				14ED9AA74A5A2E807B36B928AAE04F32 /* UXMTextAnnotation.swift in Sources */,
+				536A83F7FA72186229EBF285914A5B78 /* UXMThumbnailView.swift in Sources */,
+				37C1CD56A692371828740DFCEE4A9128 /* UXMPDFViewController.swift in Sources */,
 				EF0C3B060264BDE888EFCB98B2E95088 /* UIImage.swift in Sources */,
-				61561CB61DDA7F6200C314EB /* PDFThumbnailViewCell.swift in Sources */,
+				61561CB61DDA7F6200C314EB /* UXMThumbnailViewCell.swift in Sources */,
 				EA02320D912547EAE5017330C7835B18 /* UXMPDFKit-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -680,7 +683,8 @@
 				PRODUCT_NAME = UXMPDFKit;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -713,7 +717,8 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -751,7 +756,7 @@
 				PRODUCT_NAME = Pods_UXMPDFKit_Example;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -767,14 +772,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -835,7 +846,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -851,14 +862,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/UXMPDFKit.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/UXMPDFKit.xcscheme
index a2f2807..1861623 100644
--- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/UXMPDFKit.xcscheme
+++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/UXMPDFKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Example/UXMPDFKit.xcodeproj/project.pbxproj b/Example/UXMPDFKit.xcodeproj/project.pbxproj
index 5b0f08d..0b08ab3 100644
--- a/Example/UXMPDFKit.xcodeproj/project.pbxproj
+++ b/Example/UXMPDFKit.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
 		614D2EE31C8C8A9A00A856CD /* sample.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 614D2EE21C8C8A9A00A856CD /* sample.pdf */; };
 		616B61061CF7395100B743A7 /* sample2.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 616B61051CF7395100B743A7 /* sample2.pdf */; };
-		619D94B91EE7B5FA0009538F /* CHANGELOG.md in Sources */ = {isa = PBXBuildFile; fileRef = 619D94B81EE7B5FA0009538F /* CHANGELOG.md */; };
 		61CBF9411D86EB7F00282554 /* sample3.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 61CBF9401D86EB7F00282554 /* sample3.pdf */; };
 		61D3B3771CDE9C1600E7C3A6 /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61D3B3761CDE9C1600E7C3A6 /* ExampleViewController.swift */; };
 /* End PBXBuildFile section */
@@ -160,13 +159,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = 9592M4L4J8;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -260,7 +259,6 @@
 				607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
 				607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
 				61D3B3771CDE9C1600E7C3A6 /* ExampleViewController.swift in Sources */,
-				619D94B91EE7B5FA0009538F /* CHANGELOG.md in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -294,14 +292,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -330,6 +334,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
@@ -342,14 +347,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -370,6 +381,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -399,7 +411,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.uxmstudio.uxmpdfit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -428,7 +441,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.uxmstudio.uxmpdfit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
diff --git a/Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme b/Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme
index 180fa0a..f6b736e 100644
--- a/Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme
+++ b/Example/UXMPDFKit.xcodeproj/xcshareddata/xcschemes/UXMPDFKit-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -59,6 +60,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Example/UXMPDFKit/Base.lproj/Main.storyboard b/Example/UXMPDFKit/Base.lproj/Main.storyboard
index e077937..a8f72ad 100644
--- a/Example/UXMPDFKit/Base.lproj/Main.storyboard
+++ b/Example/UXMPDFKit/Base.lproj/Main.storyboard
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="uvK-v8-bCe">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="uvK-v8-bCe">
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -18,11 +14,11 @@
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="RQY-pS-dQA" customClass="PDFSinglePageViewer" customModule="UXMPDFKit">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="RQY-pS-dQA" customClass="UXMSinglePageViewer" customModule="UXMPDFKit">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="zJH-Zp-75z">
                                     <size key="itemSize" width="50" height="50"/>
                                     <size key="headerReferenceSize" width="0.0" height="0.0"/>
@@ -57,27 +53,27 @@
                         <viewControllerLayoutGuide type="bottom" id="nef-rF-CcU"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="2p7-Jv-JUY">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="25" translatesAutoresizingMaskIntoConstraints="NO" id="OLW-lB-Po9">
-                                <rect key="frame" x="20" y="72" width="335" height="200"/>
+                                <rect key="frame" x="20" y="72" width="560" height="200"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="43y-sh-Ug0">
-                                        <rect key="frame" x="0.0" y="0.0" width="335" height="90"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="560" height="90"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="90" id="7C5-gA-uJ4"/>
                                         </constraints>
                                     </imageView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yJY-V6-3bH">
-                                        <rect key="frame" x="0.0" y="115" width="335" height="30"/>
+                                        <rect key="frame" x="0.0" y="115" width="560" height="30"/>
                                         <state key="normal" title="Show Storyboard PDF"/>
                                         <connections>
                                             <segue destination="vXZ-lx-hvc" kind="presentation" id="UN2-UW-JIQ"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0IF-mC-Uht">
-                                        <rect key="frame" x="0.0" y="170" width="335" height="30"/>
+                                        <rect key="frame" x="0.0" y="170" width="560" height="30"/>
                                         <state key="normal" title="Show Full PDF Viewer"/>
                                         <connections>
                                             <action selector="loadPDF" destination="YMO-8V-zsq" eventType="touchUpInside" id="tHc-eD-Jc7"/>
diff --git a/Example/UXMPDFKit/ExampleViewController.swift b/Example/UXMPDFKit/ExampleViewController.swift
index df4f9ae..c7d2567 100644
--- a/Example/UXMPDFKit/ExampleViewController.swift
+++ b/Example/UXMPDFKit/ExampleViewController.swift
@@ -14,13 +14,13 @@ class ExampleViewController: UIViewController {
     @IBAction func loadPDF() {
 
         let url = Bundle.main.path(forResource: "sample2", ofType: "pdf")!
-        let document = try! PDFDocument.from(filePath: url)
+        let document = try! UXMPDFDocument.from(filePath: url)
         
-        let pdf = PDFViewController(document: document!)
+        let pdf = UXMPDFViewController(document: document!)
         pdf.annotationController.annotationTypes = [
             PDFHighlighterAnnotation.self,
             PDFPenAnnotation.self,
-            PDFTextAnnotation.self
+            UXMTextAnnotation.self
         ]
         
         self.navigationController?.pushViewController(pdf, animated: true)
diff --git a/Example/UXMPDFKit/ViewController.swift b/Example/UXMPDFKit/ViewController.swift
index f325319..364992d 100644
--- a/Example/UXMPDFKit/ViewController.swift
+++ b/Example/UXMPDFKit/ViewController.swift
@@ -11,13 +11,13 @@ import UXMPDFKit
 
 class ViewController: UIViewController {
     
-    @IBOutlet var collectionView:PDFSinglePageViewer!
+    @IBOutlet var collectionView:UXMSinglePageViewer!
     
     override func viewDidLoad() {
         super.viewDidLoad()
         
         let url = Bundle.main.path(forResource: "sample", ofType: "pdf")!
-        let document = try! PDFDocument(filePath: url, password: "")
+        let document = try! UXMPDFDocument(filePath: url, password: "")
         
         self.collectionView.document = document
     }
diff --git a/Pod/Classes/Annotations/PDFAnnotation.swift b/Pod/Classes/Annotations/UXMAnnotation.swift
similarity index 83%
rename from Pod/Classes/Annotations/PDFAnnotation.swift
rename to Pod/Classes/Annotations/UXMAnnotation.swift
index faedbf7..e611897 100644
--- a/Pod/Classes/Annotations/PDFAnnotation.swift
+++ b/Pod/Classes/Annotations/UXMAnnotation.swift
@@ -1,5 +1,5 @@
 //
-//  PDFAnnotation.swift
+//  UXMAnnotation.swift
 //  Pods
 //
 //  Created by Chris Anderson on 3/7/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-public protocol PDFAnnotation {
+public protocol UXMAnnotation {
     
     /// The page number the annotation is located on
     var page: Int? { get set }
@@ -41,7 +41,7 @@ public protocol PDFAnnotation {
     func encode(with aCoder: NSCoder)
 }
 
-public protocol PDFAnnotationButtonable: PDFAnnotation {
+public protocol PDFAnnotationButtonable: UXMAnnotation {
     
     /// Name for UIBarButtonItem representation of annotation
     static var name: String? { get }
@@ -51,11 +51,11 @@ public protocol PDFAnnotationButtonable: PDFAnnotation {
 }
 
 public protocol PDFAnnotationEvent {
-    func annotationUpdated(annotation: PDFAnnotation)
-    func annotation(annotation: PDFAnnotation, selected action: String)
+    func annotationUpdated(annotation: UXMAnnotation)
+    func annotation(annotation: UXMAnnotation, selected action: String)
 }
 
 public protocol PDFAnnotationView {
-    var parent: PDFAnnotation? { get }
+    var parent: UXMAnnotation? { get }
     var canBecomeFirstResponder: Bool { get }
 }
diff --git a/Pod/Classes/Annotations/PDFAnnotationController.swift b/Pod/Classes/Annotations/UXMAnnotationController.swift
similarity index 82%
rename from Pod/Classes/Annotations/PDFAnnotationController.swift
rename to Pod/Classes/Annotations/UXMAnnotationController.swift
index e0cd2b0..8862a9f 100644
--- a/Pod/Classes/Annotations/PDFAnnotationController.swift
+++ b/Pod/Classes/Annotations/UXMAnnotationController.swift
@@ -1,5 +1,5 @@
 //
-//  PDFAnnotationController.swift
+//  UXMAnnotationController.swift
 //  Pods
 //
 //  Created by Chris Anderson on 6/22/16.
@@ -8,26 +8,26 @@
 
 import Foundation
 
-public protocol PDFAnnotationControllerProtocol {
+public protocol UXMAnnotationControllerProtocol {
     func annotationWillStart(touch: UITouch) -> Int?
 }
 
-open class PDFAnnotationController: UIViewController {
+open class UXMAnnotationController: UIViewController {
     
     /// Reference to document
-    var document: PDFDocument!
+    var document: UXMPDFDocument!
     
     /// Store containing all annotations for document
-    var annotations = PDFAnnotationStore()
+    var annotations = UXMAnnotationStore()
     
     /// References to pages within view
-    var allPages = [PDFPageContentView]()
+    var allPages = [UXMPageContentView]()
     
     /// Type of annotation being added
-    var annotationType: PDFAnnotation.Type?
+    var annotationType: UXMAnnotation.Type?
     
-    open var annotationTypes: [PDFAnnotation.Type] = [
-        PDFTextAnnotation.self,
+    open var annotationTypes: [UXMAnnotation.Type] = [
+        UXMTextAnnotation.self,
         PDFPenAnnotation.self,
         PDFHighlighterAnnotation.self,
         ] {
@@ -37,41 +37,41 @@ open class PDFAnnotationController: UIViewController {
     }
     
     /// The buttons for the created annotation types
-    var buttons: [PDFBarButton] = []
+    var buttons: [UXMBarButton] = []
     
     /// Delegate reference for annotation events
-    var annotationDelegate: PDFAnnotationControllerProtocol?
+    var annotationDelegate: UXMAnnotationControllerProtocol?
     
     /// Current annotation
-    open var currentAnnotation: PDFAnnotation?
+    open var currentAnnotation: UXMAnnotation?
     
     open var currentAnnotationPage: Int? {
         return currentAnnotation?.page
     }
 
-    open var currentPage: PDFPageContentView? {
+    open var currentPage: UXMPageContentView? {
         return allPages.filter({ $0.page == currentAnnotationPage }).first
     }
     
-    var pageView: PDFPageContent? {
+    var pageView: UXMPageContent? {
         return currentPage?.contentView
     }
     
-    func pageViewFor(page: Int) -> PDFPageContent? {
+    func pageViewFor(page: Int) -> UXMPageContent? {
         return self.pageContentViewFor(page: page)?.contentView
     }
     
-    func pageContentViewFor(page: Int) -> PDFPageContentView? {
+    func pageContentViewFor(page: Int) -> UXMPageContentView? {
         return allPages.filter({ $0.page == page }).first
     }
     
     //MARK: - Bar button items
     
-    lazy var undoButton: PDFBarButton = PDFBarButton(
+    lazy var undoButton: UXMBarButton = UXMBarButton(
         image: UIImage.bundledImage("undo"),
         toggled: false,
         target: self,
-        action: #selector(PDFAnnotationController.selectedUndo(_:))
+        action: #selector(UXMAnnotationController.selectedUndo(_:))
     )
     
     /**
@@ -83,7 +83,7 @@ open class PDFAnnotationController: UIViewController {
      
      - Returns: An instance of the PDFAnnotationController
      */
-    public init(document: PDFDocument, delegate: PDFAnnotationControllerProtocol) {
+    public init(document: UXMPDFDocument, delegate: UXMAnnotationControllerProtocol) {
         self.document = document
         self.annotations = document.annotations
         self.annotationDelegate = delegate
@@ -103,9 +103,9 @@ open class PDFAnnotationController: UIViewController {
      
      - Returns: An instance of the PDFAnnotationController
      */
-    public convenience init(document: PDFDocument,
-                            delegate: PDFAnnotationControllerProtocol,
-                            annotationTypes: [PDFAnnotation.Type]) {
+    public convenience init(document: UXMPDFDocument,
+                            delegate: UXMAnnotationControllerProtocol,
+                            annotationTypes: [UXMAnnotation.Type]) {
         self.init(document: document, delegate: delegate)
         self.annotationTypes = annotationTypes
     }
@@ -123,7 +123,7 @@ open class PDFAnnotationController: UIViewController {
     }
     
     //MARK: - Annotation handling
-    open func showAnnotations(_ contentView: PDFPageContentView) {
+    open func showAnnotations(_ contentView: UXMPageContentView) {
         let page = contentView.page
         if let pageIndex = allPages.index(where: { $0.page == page }) {
             clear(pageView: allPages[pageIndex].contentView)
@@ -140,7 +140,7 @@ open class PDFAnnotationController: UIViewController {
         }
     }
     
-    open func startAnnotation(_ type: PDFAnnotation.Type?) {
+    open func startAnnotation(_ type: UXMAnnotation.Type?) {
         finishAnnotation()
         annotationType = type
         
@@ -175,19 +175,19 @@ open class PDFAnnotationController: UIViewController {
         }
     }
     
-    @IBAction func selectedUndo(_ button: PDFBarButton) {
+    @IBAction func selectedUndo(_ button: UXMBarButton) {
         
         finishAnnotation()
         undo()
     }
     
-    func select(annotation: PDFAnnotation?) {
+    func select(annotation: UXMAnnotation?) {
         self.currentAnnotation?.didEnd()
         self.currentAnnotation = annotation
         self.currentAnnotation?.delegate = self
     }
     
-    func loadButtons(for annotations: [PDFAnnotation.Type]) {
+    func loadButtons(for annotations: [UXMAnnotation.Type]) {
         self.buttons = self.annotationTypes.flatMap {
             
             if let annotation = $0 as? PDFAnnotationButtonable.Type {
@@ -221,7 +221,7 @@ open class PDFAnnotationController: UIViewController {
         }
     }
     
-    func clear(pageView: PDFPageContent) {
+    func clear(pageView: UXMPageContent) {
         for subview in pageView.subviews {
             if subview is PDFAnnotationView {
                 subview.removeFromSuperview()
@@ -292,10 +292,10 @@ open class PDFAnnotationController: UIViewController {
     }
 }
 
-extension PDFAnnotationController: PDFAnnotationEvent {
-    public func annotationUpdated(annotation: PDFAnnotation) {  }
+extension UXMAnnotationController: PDFAnnotationEvent {
+    public func annotationUpdated(annotation: UXMAnnotation) {  }
     
-    public func annotation(annotation: PDFAnnotation, selected action: String) {
+    public func annotation(annotation: UXMAnnotation, selected action: String) {
         if action == "delete" {
             self.annotations.remove(annotation: annotation)
             
@@ -310,7 +310,7 @@ extension PDFAnnotationController: PDFAnnotationEvent {
     }
 }
 
-extension PDFAnnotationController: PDFRenderer {
+extension UXMAnnotationController: UXMRenderer {
     public func render(_ page: Int, context: CGContext, bounds: CGRect) {
         annotations.renderInContext(context, size: bounds, page: page)
     }
diff --git a/Pod/Classes/Annotations/PDFAnnotationStore.swift b/Pod/Classes/Annotations/UXMAnnotationStore.swift
similarity index 67%
rename from Pod/Classes/Annotations/PDFAnnotationStore.swift
rename to Pod/Classes/Annotations/UXMAnnotationStore.swift
index c35058b..2ab1202 100644
--- a/Pod/Classes/Annotations/PDFAnnotationStore.swift
+++ b/Pod/Classes/Annotations/UXMAnnotationStore.swift
@@ -1,5 +1,5 @@
 //
-//  PDFAnnotationStore.swift
+//  UXMAnnotationStore.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/8/16.
@@ -9,31 +9,31 @@
 import UIKit
 
 
-public protocol PDFAnnotationStoreDelegate {
+public protocol UXMAnnotationStoreDelegate {
 
-    func annotationStore(store: PDFAnnotationStore, addedAnnotation: PDFAnnotation)
-    func annotationStore(store: PDFAnnotationStore, removedAnnotation: PDFAnnotation)
+    func annotationStore(store: UXMAnnotationStore, addedAnnotation: UXMAnnotation)
+    func annotationStore(store: UXMAnnotationStore, removedAnnotation: UXMAnnotation)
 }
 
-open class PDFAnnotationStore: NSObject, NSCoding {
+open class UXMAnnotationStore: NSObject, NSCoding {
 
-    var annotations: [PDFAnnotation] = []
-    var delegate: PDFAnnotationStoreDelegate?
+    var annotations: [UXMAnnotation] = []
+    var delegate: UXMAnnotationStoreDelegate?
 
 
-    func add(annotation: PDFAnnotation) {
+    func add(annotation: UXMAnnotation) {
         annotations.append(annotation)
         self.delegate?.annotationStore(store: self, addedAnnotation: annotation)
     }
 
-    func remove(annotation: PDFAnnotation) {
+    func remove(annotation: UXMAnnotation) {
         if let index = annotations.index(where: { $0.uuid == annotation.uuid }), index > -1 {
             self.delegate?.annotationStore(store: self, removedAnnotation: annotation)
             self.annotations.remove(at: index)
         }
     }
 
-    func undo() -> PDFAnnotation? {
+    func undo() -> UXMAnnotation? {
 
         if let annotation = annotations.popLast() {
             self.delegate?.annotationStore(store: self, removedAnnotation: annotation)
@@ -42,7 +42,7 @@ open class PDFAnnotationStore: NSObject, NSCoding {
         return nil
     }
 
-    func annotations(page: Int) -> [PDFAnnotation] {
+    func annotations(page: Int) -> [UXMAnnotation] {
         return annotations.filter({ $0.page == page })
     }
 
@@ -55,7 +55,7 @@ open class PDFAnnotationStore: NSObject, NSCoding {
     override init() { super.init() }
 
     required public init(coder aDecoder: NSCoder) {
-        annotations = aDecoder.decodeObject(forKey: "annotations") as! [PDFAnnotation]
+        annotations = aDecoder.decodeObject(forKey: "annotations") as! [UXMAnnotation]
     }
 
     public func encode(with aCoder: NSCoder) {
diff --git a/Pod/Classes/Annotations/PDFPathAnnotation.swift b/Pod/Classes/Annotations/UXMPathAnnotation.swift
similarity index 92%
rename from Pod/Classes/Annotations/PDFPathAnnotation.swift
rename to Pod/Classes/Annotations/UXMPathAnnotation.swift
index 1e37507..de661f1 100644
--- a/Pod/Classes/Annotations/PDFPathAnnotation.swift
+++ b/Pod/Classes/Annotations/UXMPathAnnotation.swift
@@ -1,5 +1,5 @@
 //
-//  PDFPathAnnotation.swift
+//  UXMPathAnnotation.swift
 //  Pods
 //
 //  Created by Chris Anderson on 6/24/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-open class PDFPathAnnotation: NSObject, NSCoding {
+open class UXMPathAnnotation: NSObject, NSCoding {
     
     public var page: Int?
     public var uuid: String = UUID().uuidString
@@ -83,10 +83,10 @@ open class PDFPathAnnotation: NSObject, NSCoding {
 }
 
 class PDFPathView: ResizableView, PDFAnnotationView {
-    var parent: PDFAnnotation?
+    var parent: UXMAnnotation?
     override var canBecomeFirstResponder: Bool { return true }
     
-    convenience init(parent: PDFPathAnnotation, frame: CGRect) {
+    convenience init(parent: UXMPathAnnotation, frame: CGRect) {
         
         self.init()
         
@@ -100,11 +100,11 @@ class PDFPathView: ResizableView, PDFAnnotationView {
     }
     
     override func draw(_ rect: CGRect) {
-        (parent as? PDFPathAnnotation)?.drawRect(rect)
+        (parent as? UXMPathAnnotation)?.drawRect(rect)
     }
 }
 
-extension PDFPathAnnotation: PDFAnnotation {
+extension UXMPathAnnotation: UXMAnnotation {
     
     public func mutableView() -> UIView {
         view = PDFPathView(parent: self, frame: rect)
@@ -182,7 +182,7 @@ extension PDFPathAnnotation: PDFAnnotation {
     }
 }
 
-extension PDFPathAnnotation: ResizableViewDelegate {
+extension UXMPathAnnotation: ResizableViewDelegate {
     func resizableViewDidBeginEditing(view: ResizableView) { }
     
     func resizableViewDidEndEditing(view: ResizableView) {
@@ -194,13 +194,13 @@ extension PDFPathAnnotation: ResizableViewDelegate {
     }
 }
 
-open class PDFPenAnnotation: PDFPathAnnotation, PDFAnnotationButtonable {
+open class PDFPenAnnotation: UXMPathAnnotation, PDFAnnotationButtonable {
     
     public static var name: String? { return "Pen" }
     public static var buttonImage: UIImage? { return UIImage.bundledImage("pen") }
 }
 
-open class PDFHighlighterAnnotation: PDFPathAnnotation, PDFAnnotationButtonable {
+open class PDFHighlighterAnnotation: UXMPathAnnotation, PDFAnnotationButtonable {
     
     public static var name: String? { return "Highlighter" }
     public static var buttonImage: UIImage? { return UIImage.bundledImage("highlighter") }
diff --git a/Pod/Classes/Annotations/PDFTextAnnotation.swift b/Pod/Classes/Annotations/UXMTextAnnotation.swift
similarity index 89%
rename from Pod/Classes/Annotations/PDFTextAnnotation.swift
rename to Pod/Classes/Annotations/UXMTextAnnotation.swift
index 32d95dd..b2504c8 100644
--- a/Pod/Classes/Annotations/PDFTextAnnotation.swift
+++ b/Pod/Classes/Annotations/UXMTextAnnotation.swift
@@ -1,5 +1,5 @@
 //
-//  PDFTextAnnotation.swift
+//  UXMTextAnnotation.swift
 //  Pods
 //
 //  Created by Chris Anderson on 6/23/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-open class PDFTextAnnotation: NSObject, NSCoding {
+open class UXMTextAnnotation: NSObject, NSCoding {
     
     public var page: Int?
     public var uuid: String = UUID().uuidString
@@ -60,7 +60,7 @@ open class PDFTextAnnotation: NSObject, NSCoding {
     }
 }
 
-extension PDFTextAnnotation: PDFAnnotation {
+extension UXMTextAnnotation: UXMAnnotation {
     
     public func mutableView() -> UIView {
         view = PDFTextAnnotationView(parent: self)
@@ -94,13 +94,13 @@ extension PDFTextAnnotation: PDFAnnotation {
         let paragraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
         paragraphStyle.alignment = NSTextAlignment.left
         
-        let attributes: [String:AnyObject] = [
-            NSFontAttributeName: font,
-            NSForegroundColorAttributeName: UIColor.black,
-            NSParagraphStyleAttributeName: paragraphStyle
+        let attributes: [NSAttributedStringKey:AnyObject] = [
+            NSAttributedStringKey.font: font,
+            NSAttributedStringKey.foregroundColor: UIColor.black,
+            NSAttributedStringKey.paragraphStyle: paragraphStyle
         ]
         
-        let size = nsText.size(attributes: attributes)
+        let size = nsText.size(withAttributes: attributes)
         let textRect = CGRect(origin: rect.origin, size: size)
         
         nsText.draw(in: textRect, withAttributes: attributes)
@@ -109,7 +109,7 @@ extension PDFTextAnnotation: PDFAnnotation {
     }
 }
 
-extension PDFTextAnnotation: ResizableViewDelegate {
+extension UXMTextAnnotation: ResizableViewDelegate {
     func resizableViewDidBeginEditing(view: ResizableView) {}
     
     func resizableViewDidEndEditing(view: ResizableView) {
@@ -121,13 +121,13 @@ extension PDFTextAnnotation: ResizableViewDelegate {
     }
 }
 
-extension PDFTextAnnotation: PDFAnnotationButtonable {
+extension UXMTextAnnotation: PDFAnnotationButtonable {
     
     public static var name: String? { return "Text" }
     public static var buttonImage: UIImage? { return UIImage.bundledImage("text-symbol") }
 }
 
-extension PDFTextAnnotation: UITextViewDelegate {
+extension UXMTextAnnotation: UITextViewDelegate {
     public func textViewDidChange(_ textView: UITextView) {
         textView.sizeToFit()
         
@@ -154,7 +154,7 @@ extension PDFTextAnnotation: UITextViewDelegate {
 
 class PDFTextAnnotationView: ResizableView, PDFAnnotationView {
     
-    var parent: PDFAnnotation?
+    var parent: UXMAnnotation?
     override var canBecomeFirstResponder: Bool { return true }
     override var menuItems: [UIMenuItem] {
         return [
@@ -189,7 +189,7 @@ class PDFTextAnnotationView: ResizableView, PDFAnnotationView {
         }
     }
     
-    convenience init(parent: PDFTextAnnotation) {
+    convenience init(parent: UXMTextAnnotation) {
         
         self.init()
         
@@ -209,7 +209,7 @@ class PDFTextAnnotationView: ResizableView, PDFAnnotationView {
         self.addSubview(textView)
     }
     
-    func menuActionEdit(_ sender: Any!) {
+    @objc func menuActionEdit(_ sender: Any!) {
         self.delegate?.resizableViewDidSelectAction(view: self, action: "edit")
         
         self.isLocked = true
diff --git a/Pod/Classes/Extensions/UIImage.swift b/Pod/Classes/Extensions/UIImage.swift
index 5b84de3..9dacfa9 100644
--- a/Pod/Classes/Extensions/UIImage.swift
+++ b/Pod/Classes/Extensions/UIImage.swift
@@ -19,7 +19,7 @@ extension UIImage {
         let image = UIImage(named: named)
         
         if image == nil {
-            let podBundle = Bundle(for: PDFViewController.classForCoder())
+            let podBundle = Bundle(for: UXMPDFViewController.classForCoder())
             if let bundleURL = podBundle.url(forResource: "UXMPDFKit", withExtension: "bundle"),
                 let bundle = Bundle(url: bundleURL) {
                 return UIImage(
diff --git a/Pod/Classes/Form/PDFArray.swift b/Pod/Classes/Form/UXMArray.swift
similarity index 89%
rename from Pod/Classes/Form/PDFArray.swift
rename to Pod/Classes/Form/UXMArray.swift
index 25bb87f..adac64e 100644
--- a/Pod/Classes/Form/PDFArray.swift
+++ b/Pod/Classes/Form/UXMArray.swift
@@ -1,5 +1,5 @@
 //
-//  PDFArray.swift
+//  UXMArray.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/27/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-internal class PDFArray: PDFObject {
+internal class UXMArray: UXMObject {
     fileprivate var arr: CGPDFArrayRef
     
     var array: [AnyObject] = []
@@ -79,18 +79,18 @@ internal class PDFArray: PDFObject {
         return nil
     }
     
-    func dictionaryAtIndex(_ index: Int) -> PDFDictionary? {
+    func dictionaryAtIndex(_ index: Int) -> UXMDictionary? {
         var dictionary: CGPDFDictionaryRef? = nil
         if CGPDFArrayGetDictionary(arr, index, &dictionary) {
-            return PDFDictionary(dictionaryRef: dictionary!)
+            return UXMDictionary(dictionaryRef: dictionary!)
         }
         return nil
     }
     
-    func arrayAtIndex(_ index: Int) -> PDFArray? {
+    func arrayAtIndex(_ index: Int) -> UXMArray? {
         var array: CGPDFArrayRef? = nil
         if CGPDFArrayGetArray(arr, index, &array) {
-            return PDFArray(arrayRef: array!)
+            return UXMArray(arrayRef: array!)
         }
         return nil
     }
@@ -139,11 +139,11 @@ internal class PDFArray: PDFObject {
         return nil
     }
     
-    func streamAtIndex(_ index: Int) -> PDFDictionary? {
+    func streamAtIndex(_ index: Int) -> UXMDictionary? {
         var stream: CGPDFStreamRef? = nil
         if CGPDFArrayGetStream(arr, index, &stream) {
             let dictionaryRef = CGPDFStreamGetDictionary(stream!)
-            return PDFDictionary(dictionaryRef: dictionaryRef!)
+            return UXMDictionary(dictionaryRef: dictionaryRef!)
         }
         return nil
     }
@@ -161,13 +161,13 @@ internal class PDFArray: PDFObject {
     }
 }
 
-extension PDFArray: NSCopying {
+extension UXMArray: NSCopying {
     func copy(with zone: NSZone?) -> Any {
-        return type(of: self).init(arrayRef: arr)
+        return Swift.type(of: self).init(arrayRef: arr)
     }
 }
 
-extension PDFArray: Sequence {
+extension UXMArray: Sequence {
     func makeIterator() -> AnyIterator<AnyObject> {
         var nextIndex = array.count - 1
         
diff --git a/Pod/Classes/Form/PDFDictionary.swift b/Pod/Classes/Form/UXMDictionary.swift
similarity index 89%
rename from Pod/Classes/Form/PDFDictionary.swift
rename to Pod/Classes/Form/UXMDictionary.swift
index 9e0ceb9..b305afd 100644
--- a/Pod/Classes/Form/PDFDictionary.swift
+++ b/Pod/Classes/Form/UXMDictionary.swift
@@ -1,5 +1,5 @@
 //
-//  PDFDictionary.swift
+//  UXMDictionary.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/27/16.
@@ -8,11 +8,11 @@
 
 import UIKit
 
-internal protocol PDFObject {
+internal protocol UXMObject {
     var type: CGPDFObjectType { get }
 }
 
-fileprivate class PDFObjectParserContext {
+fileprivate class UXMObjectParserContext {
     var keys: [UnsafePointer<Int8>] = []
     
     init(keys: [UnsafePointer<Int8>]) {
@@ -20,7 +20,7 @@ fileprivate class PDFObjectParserContext {
     }
 }
 
-func == (lhs: PDFDictionary, rhs: PDFDictionary) -> Bool {
+func == (lhs: UXMDictionary, rhs: UXMDictionary) -> Bool {
     let rect1 = lhs.arrayForKey("Rect")?.rect
     let rect2 = rhs.arrayForKey("Rect")?.rect
     
@@ -33,12 +33,12 @@ func == (lhs: PDFDictionary, rhs: PDFDictionary) -> Bool {
     return rect1 == rect2 && keys1 == keys2 && t1 == t2
 }
 
-internal class PDFDictionary: PDFObject, Equatable {
+internal class UXMDictionary: UXMObject, Equatable {
     var dict: CGPDFDictionaryRef
     
     lazy var attributes: [String:AnyObject] = {
         
-        var context = PDFObjectParserContext(keys: [])
+        var context = UXMObjectParserContext(keys: [])
         CGPDFDictionaryApplyFunction(self.dict, self.getDictionaryObjects, &context)
         
         self.keys = context.keys
@@ -73,8 +73,8 @@ internal class PDFDictionary: PDFObject, Equatable {
         return attributes[key]
     }
     
-    func arrayForKey(_ key: String) -> PDFArray? {
-        return attributes[key] as? PDFArray
+    func arrayForKey(_ key: String) -> UXMArray? {
+        return attributes[key] as? UXMArray
     }
     
     func stringForKey(_ key: String) -> String? {
@@ -129,15 +129,15 @@ internal class PDFDictionary: PDFObject, Equatable {
         return nil
     }
     
-    fileprivate func arrayFromKey(_ key: UnsafePointer<Int8>) -> PDFArray? {
+    fileprivate func arrayFromKey(_ key: UnsafePointer<Int8>) -> UXMArray? {
         var arrayObj: CGPDFArrayRef? = nil
         if CGPDFDictionaryGetArray(dict, key, &arrayObj) {
-            return PDFArray(arrayRef: arrayObj!)
+            return UXMArray(arrayRef: arrayObj!)
         }
         return nil
     }
     
-    fileprivate func dictionaryFromKey(_ key: UnsafePointer<Int8>) -> PDFDictionary? {
+    fileprivate func dictionaryFromKey(_ key: UnsafePointer<Int8>) -> UXMDictionary? {
         guard let stringKey = String(validatingUTF8: key) else {
             return nil
         }
@@ -148,12 +148,12 @@ internal class PDFDictionary: PDFObject, Equatable {
         
         var dictObj: CGPDFArrayRef? = nil
         if CGPDFDictionaryGetDictionary(dict, key, &dictObj) {
-            return PDFDictionary(dictionaryRef: dictObj!)
+            return UXMDictionary(dictionaryRef: dictObj!)
         }
         return nil
     }
     
-    fileprivate func streamFromKey(_ key: UnsafePointer<Int8>) -> PDFDictionary? {
+    fileprivate func streamFromKey(_ key: UnsafePointer<Int8>) -> UXMDictionary? {
         guard let stringKey = String(validatingUTF8: key) else {
             return nil
         }
@@ -165,7 +165,7 @@ internal class PDFDictionary: PDFObject, Equatable {
         var streamObj: CGPDFArrayRef? = nil
         if CGPDFDictionaryGetStream(self.dict, key, &streamObj) {
             let dictObj = CGPDFStreamGetDictionary(streamObj!)
-            return PDFDictionary(dictionaryRef: dictObj!)
+            return UXMDictionary(dictionaryRef: dictObj!)
         }
         return nil
     }
@@ -192,7 +192,7 @@ internal class PDFDictionary: PDFObject, Equatable {
     }
     
     var getDictionaryObjects: CGPDFDictionaryApplierFunction = { (key, object, info) in
-        let context = info!.assumingMemoryBound(to: PDFObjectParserContext.self).pointee
+        let context = info!.assumingMemoryBound(to: UXMObjectParserContext.self).pointee
         context.keys.append(key)
     }
     
@@ -202,7 +202,7 @@ internal class PDFDictionary: PDFObject, Equatable {
         
         var string = "\n\(spacer){\n"
         for (key, value) in attributes {
-            if let value = value as? PDFDictionary {
+            if let value = value as? UXMDictionary {
                 string += "\(spacer)\(key) : \(value.description(level+1))"
             } else {
                 string += "\(spacer)\(key) : \(value)\n"
diff --git a/Pod/Classes/Form/PDFFormButtonField.swift b/Pod/Classes/Form/UXMFormButtonField.swift
similarity index 85%
rename from Pod/Classes/Form/PDFFormButtonField.swift
rename to Pod/Classes/Form/UXMFormButtonField.swift
index 82a4d93..8734b3e 100644
--- a/Pod/Classes/Form/PDFFormButtonField.swift
+++ b/Pod/Classes/Form/UXMFormButtonField.swift
@@ -1,5 +1,5 @@
 //
-//  PDFFormButtonField.swift
+//  UXMFormButtonField.swift
 //  Pods
 //
 //  Created by Chris Anderson on 6/1/16.
@@ -18,7 +18,7 @@ public enum ButtonType {
     case radio, checkbox, push
 }
 
-open class PDFFormButtonField: PDFFormField {
+open class UXMFormButtonField: UXMFormField {
     open var buttonType = ButtonType.checkbox
     open var noOff = false
     open var name = ""
@@ -31,7 +31,7 @@ open class PDFFormButtonField: PDFFormField {
         return false
     }
     
-    fileprivate var button = PDFToggleButton(frame: CGRect.zero)
+    fileprivate var button = UXMToggleButton(frame: CGRect.zero)
     fileprivate let inset: CGFloat = 1.0
 
     init(frame: CGRect, radio: Bool) {
@@ -60,13 +60,13 @@ open class PDFFormButtonField: PDFFormField {
             height: frame.height - inset * 2)
         button.isOpaque = false
         button.backgroundColor = UIColor.clear
-        button.addTarget(self, action: #selector(PDFFormButtonField.buttonPressed), for: .touchUpInside)
+        button.addTarget(self, action: #selector(UXMFormButtonField.buttonPressed), for: .touchUpInside)
         button.isUserInteractionEnabled = true
         button.isExclusiveTouch = true
         addSubview(button)
     }
 
-    func buttonPressed() {
+    @objc func buttonPressed() {
         value = (isSelected ? "" : exportValue) as AnyObject?
         delegate?.formFieldValueChanged(self)
     }
@@ -105,10 +105,10 @@ open class PDFFormButtonField: PDFFormField {
         let paragraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
         paragraphStyle.alignment = NSTextAlignment.center
 
-        let attributes: [String:AnyObject] = [
-            NSFontAttributeName: font,
-            NSForegroundColorAttributeName: titleColor,
-            NSParagraphStyleAttributeName: paragraphStyle
+        let attributes: [NSAttributedStringKey:AnyObject] = [
+            NSAttributedStringKey.font: font,
+            NSAttributedStringKey.foregroundColor: titleColor,
+            NSAttributedStringKey.paragraphStyle: paragraphStyle
         ]
 
         title.draw(in: frame, withAttributes: attributes)
diff --git a/Pod/Classes/Form/PDFFormField.swift b/Pod/Classes/Form/UXMFormField.swift
similarity index 60%
rename from Pod/Classes/Form/PDFFormField.swift
rename to Pod/Classes/Form/UXMFormField.swift
index e89a565..df764c6 100644
--- a/Pod/Classes/Form/PDFFormField.swift
+++ b/Pod/Classes/Form/UXMFormField.swift
@@ -1,5 +1,5 @@
 //
-//  PDFFormField.swift
+//  UXMFormField.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/26/16.
@@ -8,19 +8,19 @@
 
 import UIKit
 
-protocol PDFFormViewDelegate {
-    func formFieldValueChanged(_ widget: PDFFormField)
-    func formFieldEntered(_ widget: PDFFormField)
-    func formFieldOptionsChanged(_ widget: PDFFormField)
+protocol UXMFormViewDelegate {
+    func formFieldValueChanged(_ widget: UXMFormField)
+    func formFieldEntered(_ widget: UXMFormField)
+    func formFieldOptionsChanged(_ widget: UXMFormField)
 }
 
-open class PDFFormFieldObject {
+open class UXMFormFieldObject {
     var value: AnyObject?
-    var options: PDFFormViewOptions?
+    var options: UXMFormViewOptions?
     
-    let dict: PDFDictionary
+    let dict: UXMDictionary
     
-    init(dict: PDFDictionary) {
+    init(dict: UXMDictionary) {
         self.dict = dict
         
         guard let type = dict["FT"] as? String else {
@@ -30,9 +30,9 @@ open class PDFFormFieldObject {
             return
         }
         
-        let flags: [PDFFormFlag]
+        let flags: [UXMFormFlag]
         if let flagsObj = dict["Ff"] as? NSNumber {
-            flags = self.determineFlags(UInt(flagsObj))
+            flags = self.determineFlags(UInt(truncating: flagsObj))
         }
         else {
             flags = []
@@ -41,7 +41,7 @@ open class PDFFormFieldObject {
         let export = self.determineExportValue(dict)
         let name = dict.stringForKey("T") ?? ""
 
-        options = PDFFormViewOptions(
+        options = UXMFormViewOptions(
             type: type,
             rect: rect,
             flags: flags,
@@ -51,7 +51,7 @@ open class PDFFormFieldObject {
         )
     }
 
-    func createFormField() -> PDFFormField? {
+    func createFormField() -> UXMFormField? {
         if let options = self.options {
             if options.type == "Btn" {
                 return self.createButtonField(options)
@@ -66,35 +66,35 @@ open class PDFFormFieldObject {
         return nil
     }
     
-    func determineFlags(_ flags: UInt) -> [PDFFormFlag] {
-        var flagsArr: [PDFFormFlag] = []
-        if ((flags & PDFFormFlag.ReadOnly.rawValue) > 0) {
-            flagsArr.append(PDFFormFlag.ReadOnly)
+    func determineFlags(_ flags: UInt) -> [UXMFormFlag] {
+        var flagsArr: [UXMFormFlag] = []
+        if ((flags & UXMFormFlag.ReadOnly.rawValue) > 0) {
+            flagsArr.append(UXMFormFlag.ReadOnly)
         }
-        if ((flags & PDFFormFlag.Required.rawValue) > 0) {
-            flagsArr.append(PDFFormFlag.Required)
+        if ((flags & UXMFormFlag.Required.rawValue) > 0) {
+            flagsArr.append(UXMFormFlag.Required)
         }
-        if ((flags & PDFFormFlag.NoExport.rawValue) > 0) {
-            flagsArr.append(PDFFormFlag.NoExport)
+        if ((flags & UXMFormFlag.NoExport.rawValue) > 0) {
+            flagsArr.append(UXMFormFlag.NoExport)
         }
-        if ((flags & PDFFormFlag.ButtonNoToggleToOff.rawValue) > 0) {
-            flagsArr.append(PDFFormFlag.ButtonNoToggleToOff)
+        if ((flags & UXMFormFlag.ButtonNoToggleToOff.rawValue) > 0) {
+            flagsArr.append(UXMFormFlag.ButtonNoToggleToOff)
         }
-        if ((flags & PDFFormFlag.ButtonRadio.rawValue) > 0) {
-            flagsArr.append(PDFFormFlag.ButtonRadio)
+        if ((flags & UXMFormFlag.ButtonRadio.rawValue) > 0) {
+            flagsArr.append(UXMFormFlag.ButtonRadio)
         }
-        if ((flags & PDFFormFlag.ButtonPushButton.rawValue) > 0) {
-            flagsArr.append(PDFFormFlag.ButtonPushButton)
+        if ((flags & UXMFormFlag.ButtonPushButton.rawValue) > 0) {
+            flagsArr.append(UXMFormFlag.ButtonPushButton)
         }
-        if ((flags & PDFFormFlag.TextFieldMultiline.rawValue) > 0) {
-            flagsArr.append(PDFFormFlag.TextFieldMultiline)
+        if ((flags & UXMFormFlag.TextFieldMultiline.rawValue) > 0) {
+            flagsArr.append(UXMFormFlag.TextFieldMultiline)
         }
         return flagsArr
     }
     
-    func determineExportValue(_ dict: PDFDictionary) -> String {
-        if let apObj = dict["AP"] as? PDFDictionary {
-            if let nObj = apObj["N"] as? PDFDictionary {
+    func determineExportValue(_ dict: UXMDictionary) -> String {
+        if let apObj = dict["AP"] as? UXMDictionary {
+            if let nObj = apObj["N"] as? UXMDictionary {
                 for key in nObj.allKeys() {
                     if key == "Off" || key == "OFF" {
                         return key
@@ -109,9 +109,9 @@ open class PDFFormFieldObject {
         return ""
     }
     
-    func createTextField(_ options: PDFFormViewOptions) -> PDFFormField {
-        let multiline = options.flags?.contains(PDFFormFlag.TextFieldMultiline) ?? false
-        let field = PDFFormTextField(frame: options.rect, multiline: multiline, alignment: NSTextAlignment.left)
+    func createTextField(_ options: UXMFormViewOptions) -> UXMFormField {
+        let multiline = options.flags?.contains(UXMFormFlag.TextFieldMultiline) ?? false
+        let field = UXMFormTextField(frame: options.rect, multiline: multiline, alignment: NSTextAlignment.left)
         field.delegate = self
         if let value = self.value {
             field.value = value
@@ -119,9 +119,9 @@ open class PDFFormFieldObject {
         return field
     }
     
-    func createButtonField(_ options: PDFFormViewOptions) -> PDFFormField {
-        let radio = options.flags?.contains(where: { $0 == PDFFormFlag.ButtonRadio }) ?? false
-        let field = PDFFormButtonField(frame: options.rect, radio: radio)
+    func createButtonField(_ options: UXMFormViewOptions) -> UXMFormField {
+        let radio = options.flags?.contains(where: { $0 == UXMFormFlag.ButtonRadio }) ?? false
+        let field = UXMFormButtonField(frame: options.rect, radio: radio)
         field.name = options.name
         field.exportValue = options.exportValue
         field.delegate = self
@@ -132,8 +132,8 @@ open class PDFFormFieldObject {
         return field
     }
     
-    func createSignatureField(_ options: PDFFormViewOptions) -> PDFFormField {
-        let field = PDFFormSignatureField(frame: options.rect)
+    func createSignatureField(_ options: UXMFormViewOptions) -> UXMFormField {
+        let field = UXMFormSignatureField(frame: options.rect)
         field.delegate = self
         if let value = self.value {
             field.value = value
@@ -142,17 +142,17 @@ open class PDFFormFieldObject {
     }
 }
 
-extension PDFFormFieldObject: PDFFormViewDelegate {
-    func formFieldValueChanged(_ widget: PDFFormField) {
+extension UXMFormFieldObject: UXMFormViewDelegate {
+    func formFieldValueChanged(_ widget: UXMFormField) {
         self.value = widget.value
     }
     
-    func formFieldEntered(_ widget: PDFFormField) { }
+    func formFieldEntered(_ widget: UXMFormField) { }
     
-    func formFieldOptionsChanged(_ widget: PDFFormField) { }
+    func formFieldOptionsChanged(_ widget: UXMFormField) { }
 }
 
-open class PDFFormField: UIView {
+open class UXMFormField: UIView {
     var zoomScale: CGFloat = 1.0
     var options: [AnyObject] = []
     var baseFrame: CGRect
@@ -162,7 +162,7 @@ open class PDFFormField: UIView {
         }
     }
     
-    var delegate: PDFFormViewDelegate?
+    var delegate: UXMFormViewDelegate?
     
     override init(frame: CGRect) {
         self.baseFrame = frame
diff --git a/Pod/Classes/Form/PDFFormPageView.swift b/Pod/Classes/Form/UXMFormPageView.swift
similarity index 65%
rename from Pod/Classes/Form/PDFFormPageView.swift
rename to Pod/Classes/Form/UXMFormPageView.swift
index 9e3b729..7158c5c 100644
--- a/Pod/Classes/Form/PDFFormPageView.swift
+++ b/Pod/Classes/Form/UXMFormPageView.swift
@@ -8,53 +8,53 @@
 
 import UIKit
 
-struct PDFFormViewOptions {
+struct UXMFormViewOptions {
     var type: String
     var rect: CGRect
-    var flags: [PDFFormFlag]?
+    var flags: [UXMFormFlag]?
     var name: String = ""
     var exportValue: String = ""
     var options: [String]?
 }
 
-struct PDFFormFlag: Equatable {
+struct UXMFormFlag: Equatable {
     let rawValue: UInt
     
-    static let ReadOnly             = PDFFormFlag(rawValue:1 << 0)
-    static let Required             = PDFFormFlag(rawValue:1 << 1)
-    static let NoExport             = PDFFormFlag(rawValue:1 << 2)
-    static let TextFieldMultiline   = PDFFormFlag(rawValue:1 << 12)
-    static let TextFieldPassword    = PDFFormFlag(rawValue:1 << 13)
-    static let ButtonNoToggleToOff  = PDFFormFlag(rawValue:1 << 14)
-    static let ButtonRadio          = PDFFormFlag(rawValue:1 << 15)
-    static let ButtonPushButton     = PDFFormFlag(rawValue:1 << 16)
-    static let ChoiceFieldIsCombo   = PDFFormFlag(rawValue:1 << 17)
-    static let ChoiceFieldEditable  = PDFFormFlag(rawValue:1 << 18)
-    static let ChoiceFieldSorted    = PDFFormFlag(rawValue:1 << 19)
+    static let ReadOnly             = UXMFormFlag(rawValue:1 << 0)
+    static let Required             = UXMFormFlag(rawValue:1 << 1)
+    static let NoExport             = UXMFormFlag(rawValue:1 << 2)
+    static let TextFieldMultiline   = UXMFormFlag(rawValue:1 << 12)
+    static let TextFieldPassword    = UXMFormFlag(rawValue:1 << 13)
+    static let ButtonNoToggleToOff  = UXMFormFlag(rawValue:1 << 14)
+    static let ButtonRadio          = UXMFormFlag(rawValue:1 << 15)
+    static let ButtonPushButton     = UXMFormFlag(rawValue:1 << 16)
+    static let ChoiceFieldIsCombo   = UXMFormFlag(rawValue:1 << 17)
+    static let ChoiceFieldEditable  = UXMFormFlag(rawValue:1 << 18)
+    static let ChoiceFieldSorted    = UXMFormFlag(rawValue:1 << 19)
 }
 
-func ==(lhs: PDFFormFlag, rhs: PDFFormFlag) -> Bool {
+func ==(lhs: UXMFormFlag, rhs: UXMFormFlag) -> Bool {
     return lhs.rawValue == rhs.rawValue
 }
 
-open class PDFFormPage: NSObject {
+open class UXMFormPage: NSObject {
     let page: Int
-    var fields: [PDFFormFieldObject] = []
+    var fields: [UXMFormFieldObject] = []
     let zoomScale: CGFloat = 1.0
     
     init(page: Int) {
         self.page = page
     }
     
-    func showForm(_ contentView: PDFPageContentView) {
-        let formView = PDFFormPageView(
+    func showForm(_ contentView: UXMPageContentView) {
+        let formView = UXMFormPageView(
             frame: contentView.contentView.cropBoxRect,
             boundingBox: contentView.containerView.frame,
             cropBox: contentView.contentView.cropBoxRect,
             fields: self.fields)
         
         formView.zoomScale = contentView.zoomScale
-        if contentView.contentView.subviews.filter({ $0 is PDFFormPageView }).count <= 0 {
+        if contentView.contentView.subviews.filter({ $0 is UXMFormPageView }).count <= 0 {
             contentView.contentView.addSubview(formView)
         }
         contentView.viewDidZoom = { scale in
@@ -63,12 +63,12 @@ open class PDFFormPage: NSObject {
         contentView.sendSubview(toBack: formView)
     }
     
-    func createFormField(_ dict: PDFDictionary) {
-        fields.append(PDFFormFieldObject(dict: dict))
+    func createFormField(_ dict: UXMDictionary) {
+        fields.append(UXMFormFieldObject(dict: dict))
     }
     
     func renderInContext(_ context: CGContext, size: CGRect) {
-        let formView = PDFFormPageView(
+        let formView = UXMFormPageView(
             frame: size,
             boundingBox: size,
             cropBox: size,
@@ -77,16 +77,16 @@ open class PDFFormPage: NSObject {
     }
 }
 
-open class PDFFormPageView: UIView {
-    var fields: [PDFFormFieldObject]
-    var fieldViews: [PDFFormField] = []
+open class UXMFormPageView: UIView {
+    var fields: [UXMFormFieldObject]
+    var fieldViews: [UXMFormField] = []
     var zoomScale: CGFloat = 1.0
     
     let cropBox: CGRect
     let boundingBox: CGRect
     let baseFrame: CGRect
     
-    init(frame: CGRect, boundingBox: CGRect, cropBox: CGRect, fields: [PDFFormFieldObject]) {
+    init(frame: CGRect, boundingBox: CGRect, cropBox: CGRect, fields: [UXMFormFieldObject]) {
         self.baseFrame = frame
         self.cropBox = cropBox
         self.boundingBox = boundingBox
@@ -112,7 +112,7 @@ open class PDFFormPageView: UIView {
         }
     }
     
-    func adjustFrame(_ field: PDFFormField) {
+    func adjustFrame(_ field: UXMFormField) {
         let factor: CGFloat = 1.0
         let correctedFrame = CGRect(
             x: (field.baseFrame.origin.x - cropBox.origin.x) * factor,
diff --git a/Pod/Classes/Form/PDFFormSignatureField.swift b/Pod/Classes/Form/UXMFormSignatureField.swift
similarity index 91%
rename from Pod/Classes/Form/PDFFormSignatureField.swift
rename to Pod/Classes/Form/UXMFormSignatureField.swift
index e7a013c..af592a4 100644
--- a/Pod/Classes/Form/PDFFormSignatureField.swift
+++ b/Pod/Classes/Form/UXMFormSignatureField.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-open class PDFFormSignatureField: PDFFormField {
+open class UXMFormSignatureField: UXMFormField {
     
     open var name: String?
     
@@ -21,7 +21,7 @@ open class PDFFormSignatureField: PDFFormField {
         button.tintColor = UIColor.black
         button.titleLabel?.font = UIFont.systemFont(ofSize: 14.0)
         button.setTitleColor(UIColor.black, for: UIControlState())
-        button.addTarget(self, action: #selector(PDFFormSignatureField.addSignature), for: .touchUpInside)
+        button.addTarget(self, action: #selector(UXMFormSignatureField.addSignature), for: .touchUpInside)
         button.isUserInteractionEnabled = true
         button.isExclusiveTouch = true
         return button
@@ -61,9 +61,9 @@ open class PDFFormSignatureField: PDFFormField {
         }
     }
     
-    func addSignature() {
+    @objc func addSignature() {
         
-        let vc = PDFFormSignatureViewController()
+        let vc = UXMFormSignatureViewController()
         vc.delegate = self
         let nvc = UINavigationController(rootViewController: vc)
         nvc.modalPresentationStyle = .formSheet
@@ -80,8 +80,8 @@ open class PDFFormSignatureField: PDFFormField {
     }
 }
 
-extension PDFFormSignatureField: PDFFormSignatureDelegate {
-    func completedSignatureDrawing(field: PDFFormFieldSignatureCaptureView) {
+extension UXMFormSignatureField: UXMFormSignatureDelegate {
+    func completedSignatureDrawing(field: UXMFormFieldSignatureCaptureView) {
         
         signImage.image = field.getSignature()
         signButton.setTitle("", for: .normal)
@@ -90,27 +90,27 @@ extension PDFFormSignatureField: PDFFormSignatureDelegate {
     }
 }
 
-protocol PDFFormSignatureDelegate {
-    func completedSignatureDrawing(field: PDFFormFieldSignatureCaptureView)
+protocol UXMFormSignatureDelegate {
+    func completedSignatureDrawing(field: UXMFormFieldSignatureCaptureView)
 }
 
-class PDFFormSignatureViewController: UIViewController {
+class UXMFormSignatureViewController: UIViewController {
     
-    var signatureView = PDFFormFieldSignatureCaptureView()
-    var delegate: PDFFormSignatureDelegate?
+    var signatureView = UXMFormFieldSignatureCaptureView()
+    var delegate: UXMFormSignatureDelegate?
     
     lazy fileprivate var doneButton: UIBarButtonItem = UIBarButtonItem(
         title: "Done",
         style: .plain,
         target: self,
-        action: #selector(PDFFormSignatureViewController.tappedDone)
+        action: #selector(UXMFormSignatureViewController.tappedDone)
     )
     
     lazy fileprivate var clearButton:UIBarButtonItem = UIBarButtonItem(
         title: "Clear",
         style: .plain,
         target: self,
-        action: #selector(PDFFormSignatureViewController.tappedClear)
+        action: #selector(UXMFormSignatureViewController.tappedClear)
     )
     
     override func viewDidLoad() {
@@ -142,7 +142,7 @@ class PDFFormSignatureViewController: UIViewController {
     }
 }
 
-class PDFFormFieldSignatureCaptureView: UIView {
+class UXMFormFieldSignatureCaptureView: UIView {
 
     // MARK: - Public properties
     var strokeWidth: CGFloat = 2.0 {
diff --git a/Pod/Classes/Form/PDFFormTextField.swift b/Pod/Classes/Form/UXMFormTextField.swift
similarity index 93%
rename from Pod/Classes/Form/PDFFormTextField.swift
rename to Pod/Classes/Form/UXMFormTextField.swift
index bb4040a..0aa13bd 100644
--- a/Pod/Classes/Form/PDFFormTextField.swift
+++ b/Pod/Classes/Form/UXMFormTextField.swift
@@ -1,5 +1,5 @@
 //
-//  PDFFormTextField.swift
+//  UXMFormTextField.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/26/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-open class PDFFormTextField: PDFFormField {
+open class UXMFormTextField: UXMFormField {
     let multiline: Bool
     let textEntryBox: UIView
     let baseFontSize: CGFloat
@@ -72,7 +72,7 @@ open class PDFFormTextField: PDFFormField {
                 textField.adjustsFontSizeToFitWidth = true
                 textField.minimumFontSize = 6.0
                 textField.font = UIFont.systemFont(ofSize: fontSizeForRect(self.frame))
-                textField.addTarget(self, action: #selector(PDFFormTextField.textChanged), for: .editingChanged)
+                textField.addTarget(self, action: #selector(UXMFormTextField.textChanged), for: .editingChanged)
             }
             
             layer.cornerRadius = frame.size.height / 6
@@ -120,13 +120,13 @@ open class PDFFormTextField: PDFFormField {
         
         /// UGLY
         (text as NSString!).draw(in: frame, withAttributes: [
-            NSFontAttributeName: font
+            NSAttributedStringKey.font: font
             ])
     }
 }
 
-extension PDFFormTextField: UITextFieldDelegate {
-    func textChanged() {
+extension UXMFormTextField: UITextFieldDelegate {
+    @objc func textChanged() {
         value = text as AnyObject?
         delegate?.formFieldValueChanged(self)
     }
@@ -136,7 +136,7 @@ extension PDFFormTextField: UITextFieldDelegate {
     }
 }
 
-extension PDFFormTextField: UITextViewDelegate {
+extension UXMFormTextField: UITextViewDelegate {
     public func textViewDidBeginEditing(_ textView: UITextView) {
         delegate?.formFieldEntered(self)
     }
diff --git a/Pod/Classes/Form/PDFFormViewController.swift b/Pod/Classes/Form/UXMFormViewController.swift
similarity index 73%
rename from Pod/Classes/Form/PDFFormViewController.swift
rename to Pod/Classes/Form/UXMFormViewController.swift
index c236cd1..e439b74 100644
--- a/Pod/Classes/Form/PDFFormViewController.swift
+++ b/Pod/Classes/Form/UXMFormViewController.swift
@@ -8,17 +8,17 @@
 
 import Foundation
 
-open class PDFFormViewController: NSObject {
-    var formPages: [Int: PDFFormPage] = [:]
+open class UXMFormViewController: NSObject {
+    var formPages: [Int: UXMFormPage] = [:]
     
-    let document: PDFDocument
-    let parser: PDFObjectParser
-    var lastPage: PDFPageContentView?
+    let document: UXMPDFDocument
+    let parser: UXMObjectParser
+    var lastPage: UXMPageContentView?
     
-    public init(document: PDFDocument) {
+    public init(document: UXMPDFDocument) {
         self.document = document
         
-        parser = PDFObjectParser(document: document)
+        parser = UXMObjectParser(document: document)
         
         super.init()
         
@@ -30,7 +30,7 @@ open class PDFFormViewController: NSObject {
             guard let attributes = self.parser.attributes else {
                 return
             }
-            guard let pages = attributes["Pages"] as? PDFDictionary else {
+            guard let pages = attributes["Pages"] as? UXMDictionary else {
                 return
             }
             guard let kids = pages.arrayForKey("Kids") else {
@@ -40,12 +40,12 @@ open class PDFFormViewController: NSObject {
             var page = kids.count
             
             for kid in kids {
-                if let dict = kid as? PDFDictionary,
+                if let dict = kid as? UXMDictionary,
                     let annots = dict.arrayForKey("Annots") {
                     
                     for annot in annots {
                         
-                        guard let annot = annot as? PDFDictionary else { continue }
+                        guard let annot = annot as? UXMDictionary else { continue }
                         self.enumerate(annot, page: page)
                     }
                 }
@@ -60,7 +60,7 @@ open class PDFFormViewController: NSObject {
         }
     }
     
-    func enumerate(_ fieldDict: PDFDictionary, page: Int = 0) {
+    func enumerate(_ fieldDict: UXMDictionary, page: Int = 0) {
         
         
         if fieldDict["Subtype"] != nil {
@@ -73,7 +73,7 @@ open class PDFFormViewController: NSObject {
         }
         
         for dict in array {
-            guard let innerFieldDict = dict as? PDFDictionary else { continue }
+            guard let innerFieldDict = dict as? UXMDictionary else { continue }
             if let type = innerFieldDict["Type"] as? String , type == "Annot" {
                 createFormField(innerFieldDict, page: page)
             }
@@ -83,20 +83,20 @@ open class PDFFormViewController: NSObject {
         }
     }
     
-    func createFormField(_ dict: PDFDictionary, page: Int = 0) {
+    func createFormField(_ dict: UXMDictionary, page: Int = 0) {
         DispatchQueue.main.async {
             if let formView = self.form(page: page) {
                 formView.createFormField(dict)
             }
             else {
-                let formView = PDFFormPage(page: page)
+                let formView = UXMFormPage(page: page)
                 formView.createFormField(dict)
                 self.formPages[page] = formView
             }
         }
     }
     
-    func showForm(_ contentView: PDFPageContentView) {
+    func showForm(_ contentView: UXMPageContentView) {
         lastPage = contentView
         let page = contentView.page
         if let formPage = self.form(page: page) {
@@ -104,12 +104,12 @@ open class PDFFormViewController: NSObject {
         }
     }
     
-    func form(page: Int) -> PDFFormPage? {
+    func form(page: Int) -> UXMFormPage? {
         return formPages[page]
     }
 }
 
-extension PDFFormViewController: PDFRenderer {
+extension UXMFormViewController: UXMRenderer {
     public func render(_ page: Int, context: CGContext, bounds: CGRect) {
         if let form = form(page: page) {
             form.renderInContext(context, size: bounds)
diff --git a/Pod/Classes/Form/PDFObjectParser.swift b/Pod/Classes/Form/UXMObjectParser.swift
similarity index 57%
rename from Pod/Classes/Form/PDFObjectParser.swift
rename to Pod/Classes/Form/UXMObjectParser.swift
index 6a29c22..00d3327 100644
--- a/Pod/Classes/Form/PDFObjectParser.swift
+++ b/Pod/Classes/Form/UXMObjectParser.swift
@@ -8,14 +8,14 @@
 
 import UIKit
 
-open class PDFObjectParser {
-    let document: PDFDocument
-    let attributes: PDFDictionary?
+open class UXMObjectParser {
+    let document: UXMPDFDocument
+    let attributes: UXMDictionary?
     
-    public init(document: PDFDocument) {
+    public init(document: UXMPDFDocument) {
         self.document = document
         if let catalogue = document.documentRef?.catalog {
-            attributes = PDFDictionary(dictionaryRef: catalogue)
+            attributes = UXMDictionary(dictionaryRef: catalogue)
         }
         else {
             attributes = nil
diff --git a/Pod/Classes/Form/PDFToggleButton.swift b/Pod/Classes/Form/UXMToggleButton.swift
similarity index 83%
rename from Pod/Classes/Form/PDFToggleButton.swift
rename to Pod/Classes/Form/UXMToggleButton.swift
index 45a944c..bcdbbd8 100644
--- a/Pod/Classes/Form/PDFToggleButton.swift
+++ b/Pod/Classes/Form/UXMToggleButton.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class PDFToggleButton: UIButton {
+class UXMToggleButton: UIButton {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -20,7 +20,7 @@ class PDFToggleButton: UIButton {
     }
 
     func setup() {
-        addTarget(self, action: #selector(PDFToggleButton.buttonTapped), for: .touchUpInside)
+        addTarget(self, action: #selector(UXMToggleButton.buttonTapped), for: .touchUpInside)
         setTitle("", for: .normal)
         setTitle(checkmark, for: .selected)
         setTitleColor(UIColor.black, for: .normal)
@@ -28,7 +28,7 @@ class PDFToggleButton: UIButton {
         titleLabel?.font = UIFont(name: "ZapfDingbatsITC", size: 10)
     }
 
-    func buttonTapped() {
+    @objc func buttonTapped() {
         self.isSelected = !self.isSelected
     }
 }
diff --git a/Pod/Classes/Model/PDFAction.swift b/Pod/Classes/Model/UXMAction.swift
similarity index 96%
rename from Pod/Classes/Model/PDFAction.swift
rename to Pod/Classes/Model/UXMAction.swift
index dfa7fcb..9c741c9 100644
--- a/Pod/Classes/Model/PDFAction.swift
+++ b/Pod/Classes/Model/UXMAction.swift
@@ -1,5 +1,5 @@
 //
-//  PDFAction.swift
+//  UXMAction.swift
 //  Pods
 //
 //  Created by Chris Anderson on 9/12/16.
@@ -8,9 +8,9 @@
 
 import Foundation
 
-open class PDFAction {
-    open static func fromPDFDictionary(_ sourceDictionary: CGPDFDictionaryRef, documentReference: CGPDFDocument) -> PDFAction? {
-        var action: PDFAction?
+open class UXMAction {
+    open static func fromPDFDictionary(_ sourceDictionary: CGPDFDictionaryRef, documentReference: CGPDFDocument) -> UXMAction? {
+        var action: UXMAction?
         var destinationName: CGPDFStringRef? = nil
         var destinationString: UnsafePointer<Int8>? = nil
         var actionDictionary: CGPDFDictionaryRef? = nil
@@ -38,7 +38,7 @@ open class PDFAction {
                             
                             let uri = UnsafeRawPointer(CGPDFStringGetBytePtr(uriString!)!).assumingMemoryBound(to: Int8.self)
                             if let target = String(validatingUTF8: uri) {
-                                action = PDFActionURL(stringUrl: target)
+                                action = UXMActionURL(stringUrl: target)
                             }
                         }
                     }
@@ -115,7 +115,7 @@ open class PDFAction {
             
             /// We have a target page number, make GoTo link
             if targetPageNumber > 0 {
-                action = PDFActionGoTo(pageIndex: targetPageNumber)
+                action = UXMActionGoTo(pageIndex: targetPageNumber)
             }
         }
         
diff --git a/Pod/Classes/Model/PDFActionGoTo.swift b/Pod/Classes/Model/UXMActionGoTo.swift
similarity index 84%
rename from Pod/Classes/Model/PDFActionGoTo.swift
rename to Pod/Classes/Model/UXMActionGoTo.swift
index fdf5816..28c0054 100644
--- a/Pod/Classes/Model/PDFActionGoTo.swift
+++ b/Pod/Classes/Model/UXMActionGoTo.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-open class PDFActionGoTo: PDFAction {
+open class UXMActionGoTo: UXMAction {
     var pageIndex: Int
     
     public init(pageIndex: Int) {
diff --git a/Pod/Classes/Model/PDFActionURL.swift b/Pod/Classes/Model/UXMActionURL.swift
similarity index 81%
rename from Pod/Classes/Model/PDFActionURL.swift
rename to Pod/Classes/Model/UXMActionURL.swift
index b23d619..982a740 100644
--- a/Pod/Classes/Model/PDFActionURL.swift
+++ b/Pod/Classes/Model/UXMActionURL.swift
@@ -1,5 +1,5 @@
 //
-//  PDFActionURL.swift
+//  UXMActionURL.swift
 //  Pods
 //
 //  Created by Chris Anderson on 11/15/16.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-open class PDFActionURL: PDFAction {
+open class UXMActionURL: UXMAction {
     var url: URL
     
     public init(url: URL) {
diff --git a/Pod/Classes/Renderer/PDFDocumentLink.swift b/Pod/Classes/Renderer/UXMDocumentLink.swift
similarity index 82%
rename from Pod/Classes/Renderer/PDFDocumentLink.swift
rename to Pod/Classes/Renderer/UXMDocumentLink.swift
index 446151e..bfa20e5 100644
--- a/Pod/Classes/Renderer/PDFDocumentLink.swift
+++ b/Pod/Classes/Renderer/UXMDocumentLink.swift
@@ -1,5 +1,5 @@
 //
-//  PDFDocumentLink.swift
+//  UXMDocumentLink.swift
 //  Pods
 //
 //  Created by Ricardo Nunez on 11/11/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-internal class PDFDocumentLink {
+internal class UXMDocumentLink {
     let rect: CGRect
     let dictionary: CGPDFDictionaryRef
     
diff --git a/Pod/Classes/Renderer/PDFDocument.swift b/Pod/Classes/Renderer/UXMPDFDocument.swift
similarity index 90%
rename from Pod/Classes/Renderer/PDFDocument.swift
rename to Pod/Classes/Renderer/UXMPDFDocument.swift
index 82b9704..feafcef 100644
--- a/Pod/Classes/Renderer/PDFDocument.swift
+++ b/Pod/Classes/Renderer/UXMPDFDocument.swift
@@ -1,5 +1,5 @@
 //
-//  PDFDocument.swift
+//  UXMPDFDocument.swift
 //  Pods
 //
 //  Created by Chris Anderson on 3/5/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-open class PDFDocument: NSObject, NSCoding {
+open class UXMPDFDocument: NSObject, NSCoding {
     
     open var documentRef: CGPDFDocument?
     
@@ -35,21 +35,21 @@ open class PDFDocument: NSObject, NSCoding {
     open var version: Float = 0.0
     
     /// Document annotations
-    open var annotations: PDFAnnotationStore = PDFAnnotationStore()
+    open var annotations: UXMAnnotationStore = UXMAnnotationStore()
     
-    public static func from(filePath: String, password: String? = nil) throws -> PDFDocument? {
-        if let document = try PDFDocument.unarchiveDocument(filePath: filePath, password: password) {
+    public static func from(filePath: String, password: String? = nil) throws -> UXMPDFDocument? {
+        if let document = try UXMPDFDocument.unarchiveDocument(filePath: filePath, password: password) {
             return document
         }
         else {
-            return try PDFDocument(filePath: filePath, password: password)
+            return try UXMPDFDocument(filePath: filePath, password: password)
         }
     }
     
-    static func unarchiveDocument(filePath: String, password: String?) throws -> PDFDocument? {
+    static func unarchiveDocument(filePath: String, password: String?) throws -> UXMPDFDocument? {
         
-        let archiveFilePath = PDFDocument.archiveFilePathForFile(path: filePath)
-        if let document = NSKeyedUnarchiver.unarchiveObject(withFile: archiveFilePath) as? PDFDocument {
+        let archiveFilePath = UXMPDFDocument.archiveFilePathForFile(path: filePath)
+        if let document = NSKeyedUnarchiver.unarchiveObject(withFile: archiveFilePath) as? UXMPDFDocument {
             document.fileUrl = URL(fileURLWithPath: filePath, isDirectory: false)
             document.password = password
             
@@ -64,11 +64,11 @@ open class PDFDocument: NSObject, NSCoding {
         self.currentPage = aDecoder.decodeInteger(forKey: "currentPage")
         self.bookmarks = aDecoder.decodeObject(forKey: "bookmarks") as! NSMutableIndexSet
         self.lastOpen = aDecoder.decodeObject(forKey: "lastOpen") as? Date
-        if let annotations = aDecoder.decodeObject(forKey: "annotations") as? PDFAnnotationStore {
+        if let annotations = aDecoder.decodeObject(forKey: "annotations") as? UXMAnnotationStore {
             self.annotations = annotations
         }
         else {
-            self.annotations = PDFAnnotationStore()
+            self.annotations = UXMAnnotationStore()
         }
         
         super.init()
@@ -76,7 +76,7 @@ open class PDFDocument: NSObject, NSCoding {
     
     public init(filePath: String, password: String? = nil) throws {
         
-        self.guid = PDFDocument.GUID()
+        self.guid = UXMPDFDocument.GUID()
         self.password = password
         self.fileUrl = URL(fileURLWithPath: filePath, isDirectory: false)
         self.lastOpen = Date()
@@ -89,7 +89,7 @@ open class PDFDocument: NSObject, NSCoding {
     }
     
     public init(fileData: NSData, password: String? = nil) throws {
-        self.guid = PDFDocument.GUID()
+        self.guid = UXMPDFDocument.GUID()
         self.password = password
         self.fileData = fileData
         self.lastOpen = NSDate() as Date
@@ -221,14 +221,14 @@ open class PDFDocument: NSObject, NSCoding {
     }
     
     static func archiveFilePathForFile(path: String) -> String {
-        let archivePath = PDFDocument.applicationSupportPath()
+        let archivePath = UXMPDFDocument.applicationSupportPath()
         
         let archiveName = (path as NSString).lastPathComponent + ".plist"
         return (archivePath as NSString).appendingPathComponent(archiveName)
     }
     
     func archiveWithFileAtPath(_ filePath: String) -> Bool {
-        let archiveFilePath = PDFDocument.archiveFilePathForFile(path: filePath)
+        let archiveFilePath = UXMPDFDocument.archiveFilePathForFile(path: filePath)
         return NSKeyedArchiver.archiveRootObject(self, toFile: archiveFilePath)
     }
     
diff --git a/Pod/Classes/Renderer/PDFViewController.swift b/Pod/Classes/Renderer/UXMPDFViewController.swift
similarity index 80%
rename from Pod/Classes/Renderer/PDFViewController.swift
rename to Pod/Classes/Renderer/UXMPDFViewController.swift
index 9a964a2..b17cd96 100644
--- a/Pod/Classes/Renderer/PDFViewController.swift
+++ b/Pod/Classes/Renderer/UXMPDFViewController.swift
@@ -1,5 +1,5 @@
 //
-//  PDFViewController.swift
+//  UXMPDFViewController.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/7/16.
@@ -9,7 +9,7 @@
 import UIKit
 import SafariServices
 
-open class PDFViewController: UIViewController {
+open class UXMPDFViewController: UIViewController {
     
     /// A boolean value that determines whether the navigation bar and scrubber bar hide on screen tap
     open var hidesBarsOnTap: Bool = true
@@ -40,7 +40,7 @@ open class PDFViewController: UIViewController {
     open var scrollDirection: UICollectionViewScrollDirection = .horizontal
     
     /// A reference to the document that is being displayed
-    var document: PDFDocument!
+    var document: UXMPDFDocument!
     
     /// A reference to the share button
     var shareBarButtonItem: UIBarButtonItem?
@@ -50,12 +50,12 @@ open class PDFViewController: UIViewController {
     open lazy var shareBarButtonAction: () -> () = { self.showActivitySheet() }
     
     /// A reference to the collection view handling page presentation
-    var collectionView: PDFSinglePageViewer!
+    var collectionView: UXMSinglePageViewer!
     
     /// A reference to the page scrubber bar
-    var pageScrubber: PDFPageScrubber!
-    private(set) open lazy var formController: PDFFormViewController = PDFFormViewController(document: self.document)
-    private(set) open lazy var annotationController: PDFAnnotationController = PDFAnnotationController(document: self.document, delegate: self)
+    var pageScrubber: UXMPageScrubber!
+    private(set) open lazy var formController: UXMFormViewController = UXMFormViewController(document: self.document)
+    private(set) open lazy var annotationController: UXMAnnotationController = UXMAnnotationController(document: self.document, delegate: self)
     
     fileprivate var showingAnnotations = false
     fileprivate var showingFormFilling = true
@@ -67,9 +67,9 @@ open class PDFViewController: UIViewController {
      - Parameters:
      - document: The document to display
      
-     - Returns: An instance of the PDFViewController
+     - Returns: An instance of the UXMPDFViewController
      */
-    public init(document: PDFDocument) {
+    public init(document: UXMPDFDocument) {
         super.init(nibName: nil, bundle: nil)
         self.document = document
     }
@@ -81,11 +81,11 @@ open class PDFViewController: UIViewController {
      - document: The document to display
      - annotationController: The controller to supervise annotations
      
-     - Returns: An instance of the PDFViewController
+     - Returns: An instance of the UXMPDFViewController
      */
-    public convenience init(document: PDFDocument, annotationController: PDFAnnotationController) {
+    public convenience init(document: UXMPDFDocument, annotationController: UXMAnnotationController) {
         self.init(document: document)
-        self.annotationController = PDFAnnotationController(document: self.document, delegate: self)
+        self.annotationController = UXMAnnotationController(document: self.document, delegate: self)
     }
     
     required public init?(coder aDecoder: NSCoder) {
@@ -95,11 +95,11 @@ open class PDFViewController: UIViewController {
     override open func viewDidLoad() {
         super.viewDidLoad()
         
-        pageScrubber = PDFPageScrubber(frame: CGRect(x: 0, y: view.frame.size.height - bottomLayoutGuide.length, width: view.frame.size.width, height: 44.0), document: document)
+        pageScrubber = UXMPageScrubber(frame: CGRect(x: 0, y: view.frame.size.height - bottomLayoutGuide.length, width: view.frame.size.width, height: 44.0), document: document)
         pageScrubber.scrubberDelegate = self
         pageScrubber.translatesAutoresizingMaskIntoConstraints = false
         
-        collectionView = PDFSinglePageViewer(frame: view.bounds, document: document)
+        collectionView = UXMSinglePageViewer(frame: view.bounds, document: document)
         collectionView.translatesAutoresizingMaskIntoConstraints = false
         collectionView.singlePageDelegate = self
         
@@ -189,7 +189,7 @@ open class PDFViewController: UIViewController {
             navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Done",
                                                                style: .plain,
                                                                target: self,
-                                                               action: #selector(PDFViewController.dismissModal))
+                                                               action: #selector(UXMPDFViewController.dismissModal))
         }
     }
     
@@ -198,21 +198,21 @@ open class PDFViewController: UIViewController {
         
         if allowsSharing {
 
-            let shareFormBarButtonItem = PDFBarButton(
+            let shareFormBarButtonItem = UXMBarButton(
                 image: UIImage.bundledImage("share"),
                 toggled: false,
                 target: self,
-                action: #selector(PDFViewController.shareDocument)
+                action: #selector(UXMPDFViewController.shareDocument)
             )
             buttons.append(shareFormBarButtonItem)
             self.shareBarButtonItem = shareFormBarButtonItem
         }
         
-        buttons.append(PDFBarButton(
+        buttons.append(UXMBarButton(
             image: UIImage.bundledImage("thumbs"),
             toggled: false,
             target: self,
-            action: #selector(PDFViewController.showThumbnailView)
+            action: #selector(UXMPDFViewController.showThumbnailView)
             )
         )
         
@@ -225,11 +225,11 @@ open class PDFViewController: UIViewController {
                 }
             }
             
-            buttons.append(PDFBarButton(
+            buttons.append(UXMBarButton(
                 image: UIImage.bundledImage("annot"),
                 toggled: showingAnnotations,
                 target: self,
-                action: #selector(PDFViewController.toggleAnnotations(_:))
+                action: #selector(UXMPDFViewController.toggleAnnotations(_:))
                 )
             )
         }
@@ -237,13 +237,13 @@ open class PDFViewController: UIViewController {
         return buttons
     }
     
-    func toggleAnnotations(_ button: PDFBarButton) {
+    @objc func toggleAnnotations(_ button: UXMBarButton) {
         showingAnnotations = !showingAnnotations
         reloadBarButtons()
     }
     
     func showActivitySheet() {
-        let renderer = PDFRenderController(document: document, controllers: [
+        let renderer = UXMRenderController(document: document, controllers: [
             annotationController,
             formController
             ])
@@ -261,8 +261,8 @@ open class PDFViewController: UIViewController {
         present(activityVC, animated: true, completion: nil)
     }
     
-    func showThumbnailView() {
-        let vc = PDFThumbnailViewController(document: document)
+    @objc func showThumbnailView() {
+        let vc = UXMThumbnailViewController(document: document)
         vc.delegate = self
         let nvc = UINavigationController(rootViewController: vc)
         nvc.modalTransitionStyle = .crossDissolve
@@ -296,16 +296,16 @@ open class PDFViewController: UIViewController {
         self.toggleBars()
     }
     
-    func shareDocument() {
+    @objc func shareDocument() {
         self.shareBarButtonAction()
     }
     
-    func dismissModal() {
+    @objc func dismissModal() {
         dismiss(animated: true, completion: nil)
     }
 }
 
-extension PDFViewController: PDFAnnotationControllerProtocol {
+extension UXMPDFViewController: UXMAnnotationControllerProtocol {
     public func annotationWillStart(touch: UITouch) -> Int? {
         let tapPoint = touch.location(in: collectionView)
         guard let pageIndex = collectionView.indexPathForItem(at: tapPoint)?.row else { return nil }
@@ -314,45 +314,45 @@ extension PDFViewController: PDFAnnotationControllerProtocol {
 }
 
 
-extension PDFViewController: PDFPageScrubberDelegate {
-    public func scrubber(_ scrubber: PDFPageScrubber, selectedPage: Int) {
+extension UXMPDFViewController: UXMPageScrubberDelegate {
+    public func scrubber(_ scrubber: UXMPageScrubber, selectedPage: Int) {
         self.scrollTo(page: selectedPage)
     }
 }
 
-extension PDFViewController: PDFSinglePageViewerDelegate {
-    public func singlePageViewer(_ collectionView: PDFSinglePageViewer, didDisplayPage page: Int) {
+extension UXMPDFViewController: UXMSinglePageViewerDelegate {
+    public func singlePageViewer(_ collectionView: UXMSinglePageViewer, didDisplayPage page: Int) {
         document.currentPage = page
         if showsScrubber {
             pageScrubber.updateScrubber()
         }
     }
     
-    public func singlePageViewer(_ collectionView: PDFSinglePageViewer, loadedContent content: PDFPageContentView) {
-//        if allowsFormFilling {
-//            formController.showForm(content)
-//        }
+    public func singlePageViewer(_ collectionView: UXMSinglePageViewer, loadedContent content: UXMPageContentView) {
+        if allowsFormFilling {
+            formController.showForm(content)
+        }
         if allowsAnnotations {
             annotationController.showAnnotations(content)
         }
     }
     
-    public func singlePageViewer(_ collectionView: PDFSinglePageViewer, selected action: PDFAction) {
-        if let action = action as? PDFActionURL {
+    public func singlePageViewer(_ collectionView: UXMSinglePageViewer, selected action: UXMAction) {
+        if let action = action as? UXMActionURL {
             let svc = SFSafariViewController(url: action.url as URL)
             present(svc, animated: true, completion: nil)
-        } else if let action = action as? PDFActionGoTo {
+        } else if let action = action as? UXMActionGoTo {
             collectionView.displayPage(action.pageIndex, animated: true)
         }
     }
     
-    public func singlePageViewer(_ collectionView: PDFSinglePageViewer, selected annotation: PDFAnnotationView) {
+    public func singlePageViewer(_ collectionView: UXMSinglePageViewer, selected annotation: PDFAnnotationView) {
         if let annotation = annotation.parent {
             annotationController.select(annotation: annotation)
         }
     }
     
-    public func singlePageViewer(_ collectionView: PDFSinglePageViewer, tapped recognizer: UITapGestureRecognizer) {
+    public func singlePageViewer(_ collectionView: UXMSinglePageViewer, tapped recognizer: UITapGestureRecognizer) {
         if hidesBarsOnTap {
             handleTap(recognizer)
         }
@@ -366,8 +366,8 @@ extension PDFViewController: PDFSinglePageViewerDelegate {
     public func singlePageViewerDidEndDragging() { }
 }
 
-extension PDFViewController: PDFThumbnailViewControllerDelegate {
-    public func thumbnailCollection(_ collection: PDFThumbnailViewController, didSelect page: Int) {
+extension UXMPDFViewController: UXMThumbnailViewControllerDelegate {
+    public func thumbnailCollection(_ collection: UXMThumbnailViewController, didSelect page: Int) {
         self.scrollTo(page: page)
         self.dismiss(animated: true, completion: nil)
     }
diff --git a/Pod/Classes/Renderer/PDFPageContent.swift b/Pod/Classes/Renderer/UXMPageContent.swift
similarity index 92%
rename from Pod/Classes/Renderer/PDFPageContent.swift
rename to Pod/Classes/Renderer/UXMPageContent.swift
index 9272dd7..af792da 100644
--- a/Pod/Classes/Renderer/PDFPageContent.swift
+++ b/Pod/Classes/Renderer/UXMPageContent.swift
@@ -1,5 +1,5 @@
 //
-//  PDFPageContent.swift
+//  UXMPageContent.swift
 //  Pods
 //
 //  Created by Chris Anderson on 3/5/16.
@@ -8,12 +8,12 @@
 
 import UIKit
 
-public class PDFPageContent: UIView {
+public class UXMPageContent: UIView {
     
     private let pdfDocRef: CGPDFDocument
     private let pdfPageRef: CGPDFPage?
     private let pageAngle: Int /// 0, 90, 180, 270
-    private var links: [PDFDocumentLink] = []
+    private var links: [UXMDocumentLink] = []
     private var pageWidth: CGFloat = 0.0
     private var pageHeight: CGFloat = 0.0
     private var pageOffsetX: CGFloat = 0.0
@@ -24,11 +24,11 @@ public class PDFPageContent: UIView {
     var viewRect: CGRect = CGRect.zero
     
     override public class var layerClass : AnyClass {
-        return PDFPageTileLayer.self
+        return UXMPageTileLayer.self
     }
     
     //MARK: - Init
-    init(pdfDocument: PDFDocument, page: Int, password: String?) {
+    init(pdfDocument: UXMPDFDocument, page: Int, password: String?) {
         pdfDocRef = pdfDocument.documentRef!
         /// Limit the page
         let pages = pdfDocRef.numberOfPages
@@ -91,7 +91,7 @@ public class PDFPageContent: UIView {
         buildAnnotationLinksList()
     }
     
-    convenience init(document: PDFDocument, page: Int) {
+    convenience init(document: UXMPDFDocument, page: Int) {
         self.init(pdfDocument: document, page: page, password: document.password)
     }
     
@@ -122,7 +122,7 @@ public class PDFPageContent: UIView {
         }
     }
     
-    private func linkFromAnnotation(_ annotation: CGPDFDictionaryRef) -> PDFDocumentLink? {
+    private func linkFromAnnotation(_ annotation: CGPDFDictionaryRef) -> UXMDocumentLink? {
         var annotationRectArray: CGPDFArrayRef? = nil
         
         guard CGPDFDictionaryGetArray(annotation, "Rect", &annotationRectArray) else { return nil }
@@ -138,15 +138,11 @@ public class PDFPageContent: UIView {
         CGPDFArrayGetNumber(annotationRectArray!, 3, &upperRightY)
         
         if lowerLeftX > upperRightX {
-            let t = lowerLeftX
-            lowerLeftX = upperRightX
-            upperRightX = t
+            (lowerLeftX, upperRightX) = (upperRightX, lowerLeftX)
         }
         
         if lowerLeftY > upperRightY {
-            let t = lowerLeftY
-            lowerLeftY = upperRightY
-            upperRightY = t
+            (lowerLeftY, upperRightY) = (upperRightY, lowerLeftY)
         }
         
         lowerLeftX -= pageOffsetX
@@ -189,7 +185,7 @@ public class PDFPageContent: UIView {
         
         let rect = CGRect(x: x, y: y, width: w, height: h)
         
-        return PDFDocumentLink(rect: rect, dictionary:annotation)
+        return UXMDocumentLink(rect: rect, dictionary:annotation)
     }
     
     private func buildAnnotationLinksList() {
@@ -219,7 +215,7 @@ public class PDFPageContent: UIView {
         let point = recognizer.location(in: self)
         
         for link in links where link.rect.contains(point) {
-            return PDFAction.fromPDFDictionary(link.dictionary, documentReference: pdfDocRef)
+            return UXMAction.fromPDFDictionary(link.dictionary, documentReference: pdfDocRef)
         }
 
         for annotation in subviews where annotation.frame.contains(point) {
diff --git a/Pod/Classes/Renderer/PDFPageContentView.swift b/Pod/Classes/Renderer/UXMPageContentView.swift
similarity index 77%
rename from Pod/Classes/Renderer/PDFPageContentView.swift
rename to Pod/Classes/Renderer/UXMPageContentView.swift
index 1ea7967..3d37971 100644
--- a/Pod/Classes/Renderer/PDFPageContentView.swift
+++ b/Pod/Classes/Renderer/UXMPageContentView.swift
@@ -1,5 +1,5 @@
 //
-//  PDFPageContentView.swift
+//  UXMPageContentView.swift
 //  Pods
 //
 //  Created by Chris Anderson on 3/5/16.
@@ -8,28 +8,30 @@
 
 import UIKit
 
-public protocol PDFPageContentViewDelegate {
-    func contentView(_ contentView: PDFPageContentView, didSelect action: PDFAction)
-    func contentView(_ contentView: PDFPageContentView, didSelect annotation: PDFAnnotationView)
-    func contentView(_ contentView: PDFPageContentView, tapped recognizer: UITapGestureRecognizer)
-    func contentView(_ contentView: PDFPageContentView, doubleTapped recognizer: UITapGestureRecognizer)
+public protocol UXMPageContentViewDelegate {
+    func contentView(_ contentView: UXMPageContentView, didSelect action: UXMAction)
+    func contentView(_ contentView: UXMPageContentView, didSelect annotation: PDFAnnotationView)
+    func contentView(_ contentView: UXMPageContentView, tapped recognizer: UITapGestureRecognizer)
+    func contentView(_ contentView: UXMPageContentView, doubleTapped recognizer: UITapGestureRecognizer)
 }
 
-open class PDFPageContentView: UIScrollView, UIScrollViewDelegate {
-    public let contentView: PDFPageContent
+open class UXMPageContentView: UIScrollView, UIScrollViewDelegate {
+    public let contentView: UXMPageContent
     let containerView: UIView
 
     open var page: Int
-    open var contentDelegate: PDFPageContentViewDelegate?
+    open var contentDelegate: UXMPageContentViewDelegate?
     open var viewDidZoom: ((CGFloat) -> Void)?
-    fileprivate var PDFPageContentViewContext = 0
     fileprivate var previousScale: CGFloat = 1.0
 
+    // KVO
+    public private(set) var frameObservation: NSKeyValueObservation?
+
     let bottomKeyboardPadding: CGFloat = 20.0
 
-    init(frame: CGRect, document: PDFDocument, page: Int) {
+    init(frame: CGRect, document: UXMPDFDocument, page: Int) {
         self.page = page
-        contentView = PDFPageContent(document: document, page: page)
+        contentView = UXMPageContent(document: document, page: page)
 
         containerView = UIView(frame: contentView.bounds)
         containerView.isUserInteractionEnabled = true
@@ -67,23 +69,13 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate {
         zoomScale = minimumZoomScale
         tag = page
 
-        self.addObserver(self, forKeyPath: "frame", options: [.new, .old], context: &PDFPageContentViewContext)
-
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(PDFPageContentView.keyboardWillShowNotification(_:)),
-            name: .UIKeyboardWillShow,
-            object: nil)
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(PDFPageContentView.keyboardWillHideNotification(_:)),
-            name: .UIKeyboardWillHide,
-            object: nil
-        )
+        frameObservation = observe(\UXMPageContentView.frame, changeHandler: handleFrameChange)
+        NotificationCenter.default.addObserver(forName: .UIKeyboardWillShow, object: nil, queue: .main, using: keyboardWillShowNotification)
+        NotificationCenter.default.addObserver(forName: .UIKeyboardWillHide, object: nil, queue: .main, using: keyboardWillHideNotification)
 
         let singleTapRecognizer = UITapGestureRecognizer(
             target: self,
-            action: #selector(PDFPageContentView.processSingleTap(_:))
+            action: #selector(UXMPageContentView.processSingleTap(_:))
         )
         singleTapRecognizer.numberOfTouchesRequired = 1
         singleTapRecognizer.numberOfTapsRequired = 1
@@ -92,7 +84,7 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate {
 
         let doubleTapRecognizer = UITapGestureRecognizer(
             target: self,
-            action: #selector(PDFPageContentView.processDoubleTap(_:))
+            action: #selector(UXMPageContentView.processDoubleTap(_:))
         )
         doubleTapRecognizer.numberOfTouchesRequired = 1
         doubleTapRecognizer.numberOfTapsRequired = 2
@@ -109,7 +101,7 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate {
         NotificationCenter.default.removeObserver(self, name: .UIKeyboardWillShow, object: nil)
         NotificationCenter.default.removeObserver(self, name: .UIKeyboardWillHide, object: nil)
 
-        self.removeObserver(self, forKeyPath: "frame")
+        frameObservation?.invalidate()
     }
 
     override open func layoutSubviews() {
@@ -135,20 +127,13 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate {
         contentView.frame = containerView.bounds
     }
 
-    override open func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-
-        guard context == &PDFPageContentViewContext,
-            let keyPath = keyPath, keyPath == "frame",
-            self == (object as? PDFPageContentView) else {
-            return
-        }
-
-        updateMinimumMaximumZoom()
-        self.zoomReset()
+    open func handleFrameChange(sender: UXMPageContentView, change: NSKeyValueObservedChange<CGRect>) {
+        sender.updateMinimumMaximumZoom()
+        sender.zoomReset()
     }
 
-    open func processSingleTap(_ recognizer: UITapGestureRecognizer) {
-        if let action = contentView.processSingleTap(recognizer) as? PDFAction {
+    @objc open func processSingleTap(_ recognizer: UITapGestureRecognizer) {
+        if let action = contentView.processSingleTap(recognizer) as? UXMAction {
             contentDelegate?.contentView(self, didSelect: action)
         }
         else if let annotation = contentView.processSingleTap(recognizer) as? PDFAnnotationView {
@@ -159,7 +144,7 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate {
         }
     }
 
-    open func processDoubleTap(_ recognizer: UITapGestureRecognizer) {
+    @objc open func processDoubleTap(_ recognizer: UITapGestureRecognizer) {
         contentDelegate?.contentView(self, doubleTapped: recognizer)
     }
 
@@ -253,7 +238,7 @@ open class PDFPageContentView: UIScrollView, UIScrollViewDelegate {
     func updateMinimumMaximumZoom() {
         previousScale = self.zoomScale
         let targetRect = bounds.insetBy(dx: 0, dy: 0)
-        let zoomScale = PDFPageContentView.zoomScaleThatFits(targetRect.size, source: contentView.bounds.size)
+        let zoomScale = UXMPageContentView.zoomScaleThatFits(targetRect.size, source: contentView.bounds.size)
 
         minimumZoomScale = zoomScale
         maximumZoomScale = zoomScale * 16.0
diff --git a/Pod/Classes/Renderer/PDFPageScrubber.swift b/Pod/Classes/Renderer/UXMPageScrubber.swift
similarity index 87%
rename from Pod/Classes/Renderer/PDFPageScrubber.swift
rename to Pod/Classes/Renderer/UXMPageScrubber.swift
index 46fe01c..d227339 100644
--- a/Pod/Classes/Renderer/PDFPageScrubber.swift
+++ b/Pod/Classes/Renderer/UXMPageScrubber.swift
@@ -1,5 +1,5 @@
 //
-//  PDFPageScrubber.swift
+//  UXMPageScrubber.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/6/16.
@@ -8,15 +8,15 @@
 
 import UIKit
 
-public protocol PDFPageScrubberDelegate {
-    func scrubber(_ scrubber: PDFPageScrubber, selectedPage: Int)
+public protocol UXMPageScrubberDelegate {
+    func scrubber(_ scrubber: UXMPageScrubber, selectedPage: Int)
 }
 
-open class PDFPageScrubber: UIToolbar {
-    let document: PDFDocument
-    var scrubber = PDFPageScrubberTrackControl()
+open class UXMPageScrubber: UIToolbar {
+    let document: UXMPDFDocument
+    var scrubber = UXMPageScrubberTrackControl()
     
-    open var scrubberDelegate: PDFPageScrubberDelegate?
+    open var scrubberDelegate: UXMPageScrubberDelegate?
     let thumbBackgroundColor = UIColor.white.withAlphaComponent(0.7)
     
     let thumbSmallGap: CGFloat = 2.0
@@ -29,9 +29,9 @@ open class PDFPageScrubber: UIToolbar {
     let pageNumberHeight: CGFloat = 30.0
     let pageNumberSpace: CGFloat = 20.0
     
-    var thumbViews: [Int: PDFThumbnailView] = [:]
+    var thumbViews: [Int: UXMThumbnailView] = [:]
     
-    var pageThumbView: PDFPageScrubberThumb?
+    var pageThumbView: UXMPageScrubberThumb?
     
     var enableTimer: Timer?
     var trackTimer: Timer?
@@ -81,7 +81,7 @@ open class PDFPageScrubber: UIToolbar {
         return pageNumberLabel
     }()
     
-    public init(frame: CGRect, document: PDFDocument) {
+    public init(frame: CGRect, document: UXMPDFDocument) {
         self.document = document
         
         super.init(frame: frame)
@@ -97,12 +97,12 @@ open class PDFPageScrubber: UIToolbar {
 
         containerView.addSubview(pageNumberView)
         
-        scrubber = PDFPageScrubberTrackControl(frame: containerView.bounds)
+        scrubber = UXMPageScrubberTrackControl(frame: containerView.bounds)
         
-        scrubber.addTarget(self, action: #selector(PDFPageScrubber.scrubberTouchDown(_:)), for: .touchDown)
-        scrubber.addTarget(self, action: #selector(PDFPageScrubber.scrubberValueChanged(_:)), for: .valueChanged)
-        scrubber.addTarget(self, action: #selector(PDFPageScrubber.scrubberTouchUp(_:)), for: .touchUpInside)
-        scrubber.addTarget(self, action: #selector(PDFPageScrubber.scrubberTouchUp(_:)), for: .touchUpOutside)
+        scrubber.addTarget(self, action: #selector(UXMPageScrubber.scrubberTouchDown(_:)), for: .touchDown)
+        scrubber.addTarget(self, action: #selector(UXMPageScrubber.scrubberValueChanged(_:)), for: .valueChanged)
+        scrubber.addTarget(self, action: #selector(UXMPageScrubber.scrubberTouchUp(_:)), for: .touchUpInside)
+        scrubber.addTarget(self, action: #selector(UXMPageScrubber.scrubberTouchUp(_:)), for: .touchUpOutside)
         
         containerView.addSubview(scrubber)
         
@@ -144,7 +144,7 @@ open class PDFPageScrubber: UIToolbar {
             
             let thumbRect = CGRect(x: thumbX, y: thumbY, width: thumbLargeWidth, height: thumbLargeHeight)
             
-            pageThumbView = PDFPageScrubberThumb(frame: thumbRect, small: false, color: thumbBackgroundColor)
+            pageThumbView = UXMPageScrubberThumb(frame: thumbRect, small: false, color: thumbBackgroundColor)
             pageThumbView?.layer.zPosition = 1.0
             
             scrubber.addSubview(pageThumbView!)
@@ -180,7 +180,7 @@ open class PDFPageScrubber: UIToolbar {
                     smallThumbView.frame = thumbRect
                 }
             } else {
-                let smallThumbView = PDFPageScrubberThumb(frame: thumbRect,
+                let smallThumbView = UXMPageScrubberThumb(frame: thumbRect,
                                                           small: true,
                                                           color: thumbBackgroundColor)
                 smallThumbView.showImage(document, page: page)
@@ -245,7 +245,7 @@ open class PDFPageScrubber: UIToolbar {
         }
     }
     
-    func trackTimerFired(_ timer: Timer) {
+    @objc func trackTimerFired(_ timer: Timer) {
         trackTimer?.invalidate()
         trackTimer = nil
         if scrubber.tag != document.currentPage {
@@ -253,7 +253,7 @@ open class PDFPageScrubber: UIToolbar {
         }
     }
     
-    func enableTimerFired(_ timer: Timer) {
+    @objc func enableTimerFired(_ timer: Timer) {
         enableTimer?.invalidate()
         enableTimer = nil
         scrubber.isUserInteractionEnabled = true
@@ -266,7 +266,7 @@ open class PDFPageScrubber: UIToolbar {
         }
         trackTimer = Timer.scheduledTimer(timeInterval: 0.25,
                                           target: self,
-                                          selector: #selector(PDFPageScrubber.trackTimerFired(_:)),
+                                          selector: #selector(UXMPageScrubber.trackTimerFired(_:)),
                                           userInfo: nil,
                                           repeats: false)
     }
@@ -279,12 +279,12 @@ open class PDFPageScrubber: UIToolbar {
 
         enableTimer = Timer.scheduledTimer(timeInterval: 0.25,
                                            target: self,
-                                           selector: #selector(PDFPageScrubber.enableTimerFired(_:)),
+                                           selector: #selector(UXMPageScrubber.enableTimerFired(_:)),
                                            userInfo: nil,
                                            repeats: false)
     }
     
-    func scrubberPageNumber(_ scrubber: PDFPageScrubberTrackControl) -> Int {
+    func scrubberPageNumber(_ scrubber: UXMPageScrubberTrackControl) -> Int {
         let controlWidth = scrubber.bounds.size.width
         let stride = controlWidth / CGFloat(document.pageCount)
         let page = Int(scrubber.value / stride)
@@ -292,7 +292,7 @@ open class PDFPageScrubber: UIToolbar {
         return page + 1
     }
     
-    func scrubberTouchDown(_ scrubber: PDFPageScrubberTrackControl) {
+    @objc func scrubberTouchDown(_ scrubber: UXMPageScrubberTrackControl) {
         let page = scrubberPageNumber(scrubber)
         
         if page != document.currentPage {
@@ -304,7 +304,7 @@ open class PDFPageScrubber: UIToolbar {
         scrubber.tag = page
     }
     
-    func scrubberTouchUp(_ scrubber: PDFPageScrubberTrackControl) {
+    @objc func scrubberTouchUp(_ scrubber: UXMPageScrubberTrackControl) {
         if trackTimer != nil {
             trackTimer?.invalidate()
             trackTimer = nil
@@ -319,7 +319,7 @@ open class PDFPageScrubber: UIToolbar {
         scrubber.tag = 0
     }
     
-    func scrubberValueChanged(_ scrubber: PDFPageScrubberTrackControl) {
+    @objc func scrubberValueChanged(_ scrubber: UXMPageScrubberTrackControl) {
         let page = self.scrubberPageNumber(scrubber)
         if page != scrubber.tag {
             updatePageNumberText(page)
diff --git a/Pod/Classes/Renderer/PDFPageScrubberThumb.swift b/Pod/Classes/Renderer/UXMPageScrubberThumb.swift
similarity index 90%
rename from Pod/Classes/Renderer/PDFPageScrubberThumb.swift
rename to Pod/Classes/Renderer/UXMPageScrubberThumb.swift
index ec5cd22..6839ad6 100644
--- a/Pod/Classes/Renderer/PDFPageScrubberThumb.swift
+++ b/Pod/Classes/Renderer/UXMPageScrubberThumb.swift
@@ -1,5 +1,5 @@
 //
-//  PDFPageScrubberThumb.swift
+//  UXMPageScrubberThumb.swift
 //  Pods
 //
 //  Created by Ricardo Nunez on 11/11/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-internal class PDFPageScrubberThumb: PDFThumbnailView {
+internal class UXMPageScrubberThumb: UXMThumbnailView {
     let small: Bool
     let color: UIColor
     
diff --git a/Pod/Classes/Renderer/PDFPageScrubberTrackControl.swift b/Pod/Classes/Renderer/UXMPageScrubberTrackControl.swift
similarity index 94%
rename from Pod/Classes/Renderer/PDFPageScrubberTrackControl.swift
rename to Pod/Classes/Renderer/UXMPageScrubberTrackControl.swift
index 38840f3..4f5515b 100644
--- a/Pod/Classes/Renderer/PDFPageScrubberTrackControl.swift
+++ b/Pod/Classes/Renderer/UXMPageScrubberTrackControl.swift
@@ -1,5 +1,5 @@
 //
-//  PDFPageScrubberTrackControl.swift
+//  UXMPageScrubberTrackControl.swift
 //  Pods
 //
 //  Created by Ricardo Nunez on 11/11/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-internal class PDFPageScrubberTrackControl: UIControl {
+internal class UXMPageScrubberTrackControl: UIControl {
     var value: CGFloat = 0.0
     
     override init(frame: CGRect) {
diff --git a/Pod/Classes/Renderer/PDFPageTileLayer.swift b/Pod/Classes/Renderer/UXMPageTileLayer.swift
similarity index 92%
rename from Pod/Classes/Renderer/PDFPageTileLayer.swift
rename to Pod/Classes/Renderer/UXMPageTileLayer.swift
index a1f82c5..f364e4d 100644
--- a/Pod/Classes/Renderer/PDFPageTileLayer.swift
+++ b/Pod/Classes/Renderer/UXMPageTileLayer.swift
@@ -1,5 +1,5 @@
 //
-//  PDFPageTileLayer.swift
+//  UXMPageTileLayer.swift
 //  Pods
 //
 //  Created by Chris Anderson on 3/5/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-internal class PDFPageTileLayer: CATiledLayer {
+internal class UXMPageTileLayer: CATiledLayer {
     override init() {
         super.init()
         
diff --git a/Pod/Classes/Renderer/PDFRenderer.swift b/Pod/Classes/Renderer/UXMRenderer.swift
similarity index 87%
rename from Pod/Classes/Renderer/PDFRenderer.swift
rename to Pod/Classes/Renderer/UXMRenderer.swift
index 94b1deb..b866e1e 100644
--- a/Pod/Classes/Renderer/PDFRenderer.swift
+++ b/Pod/Classes/Renderer/UXMRenderer.swift
@@ -1,5 +1,5 @@
 //
-//  PDFRenderer.swift
+//  UXMRenderer.swift
 //  Pods
 //
 //  Created by Chris Anderson on 6/25/16.
@@ -8,15 +8,15 @@
 
 import Foundation
 
-public protocol PDFRenderer {
+public protocol UXMRenderer {
     func render(_ page: Int, context:CGContext, bounds: CGRect)
 }
 
-open class PDFRenderController {
-    let document: PDFDocument
-    let renderControllers: [PDFRenderer]
+open class UXMRenderController {
+    let document: UXMPDFDocument
+    let renderControllers: [UXMRenderer]
     
-    public init(document: PDFDocument, controllers: [PDFRenderer]) {
+    public init(document: UXMPDFDocument, controllers: [UXMRenderer]) {
         self.document = document
         self.renderControllers = controllers
     }
diff --git a/Pod/Classes/Renderer/PDFSinglePageCell.swift b/Pod/Classes/Renderer/UXMSinglePageCell.swift
similarity index 78%
rename from Pod/Classes/Renderer/PDFSinglePageCell.swift
rename to Pod/Classes/Renderer/UXMSinglePageCell.swift
index 8df0fef..3795b55 100644
--- a/Pod/Classes/Renderer/PDFSinglePageCell.swift
+++ b/Pod/Classes/Renderer/UXMSinglePageCell.swift
@@ -1,5 +1,5 @@
 //
-//  PDFSinglePageCell.swift
+//  UXMSinglePageCell.swift
 //  Pods
 //
 //  Created by Ricardo Nunez on 11/11/16.
@@ -8,10 +8,10 @@
 
 import UIKit
 
-open class PDFSinglePageCell: UICollectionViewCell {
-    private var _pageContentView: PDFPageContentView?
+open class UXMSinglePageCell: UICollectionViewCell {
+    private var _pageContentView: UXMPageContentView?
     
-    open var pageContentView: PDFPageContentView? {
+    open var pageContentView: UXMPageContentView? {
         get {
             return _pageContentView
         }
diff --git a/Pod/Classes/Renderer/PDFSinglePageViewer.swift b/Pod/Classes/Renderer/UXMSinglePageViewer.swift
similarity index 78%
rename from Pod/Classes/Renderer/PDFSinglePageViewer.swift
rename to Pod/Classes/Renderer/UXMSinglePageViewer.swift
index 4676ae1..e474e3a 100644
--- a/Pod/Classes/Renderer/PDFSinglePageViewer.swift
+++ b/Pod/Classes/Renderer/UXMSinglePageViewer.swift
@@ -8,27 +8,27 @@
 
 import UIKit
 
-public protocol PDFSinglePageViewerDelegate {
-    func singlePageViewer(_ collectionView: PDFSinglePageViewer, didDisplayPage page: Int)
-    func singlePageViewer(_ collectionView: PDFSinglePageViewer, loadedContent content: PDFPageContentView)
-    func singlePageViewer(_ collectionView: PDFSinglePageViewer, selected action: PDFAction)
-    func singlePageViewer(_ collectionView: PDFSinglePageViewer, selected annotation: PDFAnnotationView)
-    func singlePageViewer(_ collectionView: PDFSinglePageViewer, tapped recognizer: UITapGestureRecognizer)
+public protocol UXMSinglePageViewerDelegate {
+    func singlePageViewer(_ collectionView: UXMSinglePageViewer, didDisplayPage page: Int)
+    func singlePageViewer(_ collectionView: UXMSinglePageViewer, loadedContent content: UXMPageContentView)
+    func singlePageViewer(_ collectionView: UXMSinglePageViewer, selected action: UXMAction)
+    func singlePageViewer(_ collectionView: UXMSinglePageViewer, selected annotation: PDFAnnotationView)
+    func singlePageViewer(_ collectionView: UXMSinglePageViewer, tapped recognizer: UITapGestureRecognizer)
     func singlePageViewerDidBeginDragging()
     func singlePageViewerDidEndDragging()
 }
 
-open class PDFSinglePageFlowLayout: UICollectionViewFlowLayout {
+open class UXMSinglePageFlowLayout: UICollectionViewFlowLayout {
     
     open override func shouldInvalidateLayout(forBoundsChange newBounds: CGRect) -> Bool {
         return true
     }
 }
 
-open class PDFSinglePageViewer: UICollectionView {
+open class UXMSinglePageViewer: UICollectionView {
 
-    open var singlePageDelegate: PDFSinglePageViewerDelegate?
-    open var document: PDFDocument?
+    open var singlePageDelegate: UXMSinglePageViewerDelegate?
+    open var document: UXMPDFDocument?
 
     var internalPage: Int = 0
 
@@ -38,7 +38,7 @@ open class PDFSinglePageViewer: UICollectionView {
     }
 
     private static var flowLayout: UICollectionViewFlowLayout {
-        let layout = PDFSinglePageFlowLayout()
+        let layout = UXMSinglePageFlowLayout()
         layout.scrollDirection = .horizontal
         layout.sectionInset = UIEdgeInsets.zero
         layout.minimumLineSpacing = 0.0
@@ -46,17 +46,17 @@ open class PDFSinglePageViewer: UICollectionView {
         return layout
     }
 
-    public init(frame: CGRect, document: PDFDocument) {
+    public init(frame: CGRect, document: UXMPDFDocument) {
         self.document = document
 
-        super.init(frame: frame, collectionViewLayout: PDFSinglePageViewer.flowLayout)
+        super.init(frame: frame, collectionViewLayout: UXMSinglePageViewer.flowLayout)
 
         setupCollectionView()
     }
 
     required public init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        collectionViewLayout = PDFSinglePageViewer.flowLayout
+        collectionViewLayout = UXMSinglePageViewer.flowLayout
 
         setupCollectionView()
     }
@@ -65,7 +65,7 @@ open class PDFSinglePageViewer: UICollectionView {
         isPagingEnabled = true
         backgroundColor = UIColor.groupTableViewBackground
         showsHorizontalScrollIndicator = false
-        register(PDFSinglePageCell.self, forCellWithReuseIdentifier: "ContentCell")
+        register(UXMSinglePageCell.self, forCellWithReuseIdentifier: "ContentCell")
 
         delegate = self
         dataSource = self
@@ -101,10 +101,10 @@ open class PDFSinglePageViewer: UICollectionView {
         }
     }
 
-    open func getPageContent(_ page: Int) -> PDFPageContentView? {
+    open func getPageContent(_ page: Int) -> UXMPageContentView? {
         if document == nil { return nil }
         let currentPage = indexForPage(page)
-        if let cell = self.collectionView(self, cellForItemAt: IndexPath(item: currentPage, section: 0)) as? PDFSinglePageCell,
+        if let cell = self.collectionView(self, cellForItemAt: IndexPath(item: currentPage, section: 0)) as? UXMSinglePageCell,
             let pageContentView = cell.pageContentView {
             return pageContentView
         }
@@ -118,7 +118,7 @@ open class PDFSinglePageViewer: UICollectionView {
     }
 }
 
-extension PDFSinglePageViewer: UICollectionViewDataSource {
+extension UXMSinglePageViewer: UICollectionViewDataSource {
     public func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 1
     }
@@ -131,29 +131,29 @@ extension PDFSinglePageViewer: UICollectionViewDataSource {
     }
 
     public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell = self.dequeueReusableCell(withReuseIdentifier: "ContentCell", for: indexPath) as! PDFSinglePageCell
+        let cell = self.dequeueReusableCell(withReuseIdentifier: "ContentCell", for: indexPath) as! UXMSinglePageCell
 
         let contentSize = self.collectionView(collectionView, layout: collectionViewLayout, sizeForItemAt: indexPath)
         let contentFrame = CGRect(origin: CGPoint.zero, size: contentSize)
 
         let page = indexPath.row + 1
 
-        cell.pageContentView = PDFPageContentView(frame: contentFrame, document: document!, page: page)
+        cell.pageContentView = UXMPageContentView(frame: contentFrame, document: document!, page: page)
         cell.pageContentView?.contentDelegate = self
 
         return cell
     }
 }
 
-extension PDFSinglePageViewer: UICollectionViewDelegate {
+extension UXMSinglePageViewer: UICollectionViewDelegate {
     public func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
-        if let pdfCell = cell as? PDFSinglePageCell, let pageContentView = pdfCell.pageContentView {
+        if let pdfCell = cell as? UXMSinglePageCell, let pageContentView = pdfCell.pageContentView {
             singlePageDelegate?.singlePageViewer(self, loadedContent: pageContentView)
         }
     }
 }
 
-extension PDFSinglePageViewer: UICollectionViewDelegateFlowLayout {
+extension UXMSinglePageViewer: UICollectionViewDelegateFlowLayout {
     public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         switch scrollDirection {
         case .horizontal:
@@ -163,7 +163,7 @@ extension PDFSinglePageViewer: UICollectionViewDelegateFlowLayout {
             return size
         case .vertical:
             let page = indexPath.row + 1
-            let contentViewSize = PDFPageContentView(frame: bounds, document: document!, page: page).contentSize
+            let contentViewSize = UXMPageContentView(frame: bounds, document: document!, page: page).contentSize
 
             // Find proper aspect ratio so that cell is full width
             let widthMultiplier: CGFloat
@@ -183,7 +183,7 @@ extension PDFSinglePageViewer: UICollectionViewDelegateFlowLayout {
     }
 }
 
-extension PDFSinglePageViewer: UIScrollViewDelegate {
+extension UXMSinglePageViewer: UIScrollViewDelegate {
 
     public func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
         self.singlePageDelegate?.singlePageViewerDidBeginDragging()
@@ -221,7 +221,7 @@ extension PDFSinglePageViewer: UIScrollViewDelegate {
         singlePageDelegate?.singlePageViewer(self, didDisplayPage: page)
 
         let indexPath = IndexPath(row: page - 1, section: 0)
-        if let cell = cellForItem(at: indexPath) as? PDFSinglePageCell {
+        if let cell = cellForItem(at: indexPath) as? UXMSinglePageCell {
             if let pageContentView = cell.pageContentView {
                 singlePageDelegate?.singlePageViewer(self, loadedContent: pageContentView)
             }
@@ -229,22 +229,22 @@ extension PDFSinglePageViewer: UIScrollViewDelegate {
     }
 }
 
-extension PDFSinglePageViewer: PDFPageContentViewDelegate {
-    public func contentView(_ contentView: PDFPageContentView, didSelect action: PDFAction) {
+extension UXMSinglePageViewer: UXMPageContentViewDelegate {
+    public func contentView(_ contentView: UXMPageContentView, didSelect action: UXMAction) {
         if let singlePageDelegate = singlePageDelegate {
             singlePageDelegate.singlePageViewer(self, selected: action)
-        } else if let action = action as? PDFActionGoTo {
+        } else if let action = action as? UXMActionGoTo {
             displayPage(action.pageIndex, animated: true)
         }
     }
 
-    public func contentView(_ contentView: PDFPageContentView, didSelect annotation: PDFAnnotationView) {
+    public func contentView(_ contentView: UXMPageContentView, didSelect annotation: PDFAnnotationView) {
         singlePageDelegate?.singlePageViewer(self, selected: annotation)
     }
 
-    public func contentView(_ contentView: PDFPageContentView, tapped recognizer: UITapGestureRecognizer) {
+    public func contentView(_ contentView: UXMPageContentView, tapped recognizer: UITapGestureRecognizer) {
         singlePageDelegate?.singlePageViewer(self, tapped: recognizer)
     }
 
-    public func contentView(_ contentView: PDFPageContentView, doubleTapped recognizer: UITapGestureRecognizer) {}
+    public func contentView(_ contentView: UXMPageContentView, doubleTapped recognizer: UITapGestureRecognizer) {}
 }
diff --git a/Pod/Classes/Renderer/PDFSnapshotCache.swift b/Pod/Classes/Renderer/UXMSnapshotCache.swift
similarity index 79%
rename from Pod/Classes/Renderer/PDFSnapshotCache.swift
rename to Pod/Classes/Renderer/UXMSnapshotCache.swift
index b928243..10a18e2 100644
--- a/Pod/Classes/Renderer/PDFSnapshotCache.swift
+++ b/Pod/Classes/Renderer/UXMSnapshotCache.swift
@@ -1,5 +1,5 @@
 //
-//  PDFSnapshotCache.swift
+//  UXMSnapshotCache.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/6/16.
@@ -12,15 +12,15 @@ fileprivate enum SnapshotState {
     case new, started, finished, failed
 }
 
-open class PDFSnapshot {
+open class UXMSnapshot {
     fileprivate var state = SnapshotState.new
     var image: UIImage?
-    let document: PDFDocument
+    let document: UXMPDFDocument
     let page: Int
     let guid: String
     let size: CGSize
     
-    init(document: PDFDocument, page: Int, guid: String, size: CGSize) {
+    init(document: UXMPDFDocument, page: Int, guid: String, size: CGSize) {
         self.document = document
         self.page = page
         self.guid = guid
@@ -28,7 +28,7 @@ open class PDFSnapshot {
     }
 }
 
-open class PDFQueue {
+open class UXMQueue {
     lazy var rendersInProgress = [String:Operation]()
     lazy var renderQueue: OperationQueue = {
         var queue = OperationQueue()
@@ -37,22 +37,22 @@ open class PDFQueue {
         return queue
     }()
     
-    var progressBlock: ((PDFSnapshot) -> Void)?
+    var progressBlock: ((UXMSnapshot) -> Void)?
     
-    static let sharedQueue = PDFQueue()
+    static let sharedQueue = UXMQueue()
     
-    func fetchPage(_ document: PDFDocument, page: Int, size: CGSize, completion:((PDFSnapshot) -> Void)?) {
+    func fetchPage(_ document: UXMPDFDocument, page: Int, size: CGSize, completion:((UXMSnapshot) -> Void)?) {
         let guid = "\(document.guid)_\(page)"
         
-        let thumbnail = PDFSnapshot(document: document, page: page, guid: guid, size: size)
-        if let image = PDFSnapshotCache.sharedCache.objectForKey(guid) {
+        let thumbnail = UXMSnapshot(document: document, page: page, guid: guid, size: size)
+        if let image = UXMSnapshotCache.sharedCache.objectForKey(guid) {
             thumbnail.image = image
             DispatchQueue.main.async {
                 completion?(thumbnail)
             }
         }
 
-        let thumbRender = PDFSnapshotRenderer(snapshot: thumbnail)
+        let thumbRender = UXMSnapshotRenderer(snapshot: thumbnail)
         thumbRender.completionBlock = { [unowned self] in
             self.rendersInProgress.removeValue(forKey: guid)
             DispatchQueue.main.async {
@@ -65,15 +65,15 @@ open class PDFQueue {
         renderQueue.addOperation(thumbRender)
     }
     
-    open static func fetchPage(_ document: PDFDocument, page: Int, size: CGSize, completion:((PDFSnapshot) -> Void)?) {
+    open static func fetchPage(_ document: UXMPDFDocument, page: Int, size: CGSize, completion:((UXMSnapshot) -> Void)?) {
         self.sharedQueue.fetchPage(document, page: page, size: size, completion:completion)
     }
 }
 
-fileprivate class PDFSnapshotRenderer: Operation {
-    let snapshot: PDFSnapshot
+fileprivate class UXMSnapshotRenderer: Operation {
+    let snapshot: UXMSnapshot
     
-    init(snapshot: PDFSnapshot) {
+    init(snapshot: UXMSnapshot) {
         self.snapshot = snapshot
     }
     
@@ -85,7 +85,7 @@ fileprivate class PDFSnapshotRenderer: Operation {
         }
         
         guard let image = renderPDF(snapshot.size) else {
-            PDFSnapshotCache.sharedCache.removeObjectForKey(self.snapshot.guid)
+            UXMSnapshotCache.sharedCache.removeObjectForKey(self.snapshot.guid)
             snapshot.state = .failed
             return
         }
@@ -97,7 +97,7 @@ fileprivate class PDFSnapshotRenderer: Operation {
         }
         
         snapshot.image = image
-        PDFSnapshotCache.sharedCache.setObject(image, key: self.snapshot.guid)
+        UXMSnapshotCache.sharedCache.setObject(image, key: self.snapshot.guid)
     }
     
     func renderPDF(_ size: CGSize) -> UIImage? {
@@ -139,16 +139,16 @@ fileprivate class PDFSnapshotRenderer: Operation {
     }
 }
 
-fileprivate class PDFSnapshotCache {
+fileprivate class UXMSnapshotCache {
     lazy var cache: NSCache<NSString, UIImage> = {
         let cache: NSCache<NSString, UIImage> = NSCache<NSString, UIImage>()
-        cache.name = "PDFSnapshotCache"
+        cache.name = "UXMSnapshotCache"
         cache.countLimit = 150
         cache.totalCostLimit = 10*1024*1024
         return cache
     }()
     
-    static let sharedCache = PDFSnapshotCache()
+    static let sharedCache = UXMSnapshotCache()
     
     func objectForKey(_ key: String) -> UIImage? {
         return cache.object(forKey: (key as NSString))
diff --git a/Pod/Classes/Renderer/PDFThumbnailView.swift b/Pod/Classes/Renderer/UXMThumbnailView.swift
similarity index 85%
rename from Pod/Classes/Renderer/PDFThumbnailView.swift
rename to Pod/Classes/Renderer/UXMThumbnailView.swift
index 5c31902..26746f7 100644
--- a/Pod/Classes/Renderer/PDFThumbnailView.swift
+++ b/Pod/Classes/Renderer/UXMThumbnailView.swift
@@ -1,5 +1,5 @@
 //
-//  PDFThumbnailView.swift
+//  UXMThumbnailView.swift
 //  Pods
 //
 //  Created by Chris Anderson on 5/6/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-internal class PDFThumbnailView: UIView {
+internal class UXMThumbnailView: UIView {
     let imageView: UIImageView
     
     override init(frame: CGRect) {
@@ -40,14 +40,14 @@ internal class PDFThumbnailView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
     
-    convenience init(frame: CGRect, document: PDFDocument, page: Int) {
+    convenience init(frame: CGRect, document: UXMPDFDocument, page: Int) {
         self.init(frame: frame)
         showImage(document, page: page)
     }
 
-    func showImage(_ document: PDFDocument, page: Int) {
+    func showImage(_ document: UXMPDFDocument, page: Int) {
         imageView.image = nil
-        PDFQueue.sharedQueue.fetchPage(document, page: page, size: frame.size) { (thumbnail) in
+        UXMQueue.sharedQueue.fetchPage(document, page: page, size: frame.size) { (thumbnail) in
             self.imageView.image = thumbnail.image
         }
     }
diff --git a/Pod/Classes/Renderer/PDFThumbnailViewCell.swift b/Pod/Classes/Renderer/UXMThumbnailViewCell.swift
similarity index 79%
rename from Pod/Classes/Renderer/PDFThumbnailViewCell.swift
rename to Pod/Classes/Renderer/UXMThumbnailViewCell.swift
index 3405c1b..dd55900 100644
--- a/Pod/Classes/Renderer/PDFThumbnailViewCell.swift
+++ b/Pod/Classes/Renderer/UXMThumbnailViewCell.swift
@@ -1,5 +1,5 @@
 //
-//  PDFThumbnailViewCell.swift
+//  UXMThumbnailViewCell.swift
 //  Pods
 //
 //  Created by Chris Anderson on 11/14/16.
@@ -8,9 +8,9 @@
 
 import UIKit
 
-class PDFThumbnailViewCell: UICollectionViewCell {
+class UXMThumbnailViewCell: UICollectionViewCell {
     
-    var pageThumbnail: PDFThumbnailView?
+    var pageThumbnail: UXMThumbnailView?
     
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -24,9 +24,9 @@ class PDFThumbnailViewCell: UICollectionViewCell {
         self.backgroundColor = UIColor.lightGray
     }
     
-    func configure(document: PDFDocument, page: Int) {
+    func configure(document: UXMPDFDocument, page: Int) {
         pageThumbnail?.removeFromSuperview()
-        pageThumbnail = PDFThumbnailView(frame: CGRect(x: 1,
+        pageThumbnail = UXMThumbnailView(frame: CGRect(x: 1,
                                                        y: 1,
                                                        width: self.frame.width - 2,
                                                        height: self.frame.height - 2),
diff --git a/Pod/Classes/Renderer/PDFThumbnailViewController.swift b/Pod/Classes/Renderer/UXMThumbnailViewController.swift
similarity index 81%
rename from Pod/Classes/Renderer/PDFThumbnailViewController.swift
rename to Pod/Classes/Renderer/UXMThumbnailViewController.swift
index 4e41301..3a698b5 100644
--- a/Pod/Classes/Renderer/PDFThumbnailViewController.swift
+++ b/Pod/Classes/Renderer/UXMThumbnailViewController.swift
@@ -1,5 +1,5 @@
 //
-//  PDFThumbnailViewController.swift
+//  UXMThumbnailViewController.swift
 //  Pods
 //
 //  Created by Chris Anderson on 11/14/16.
@@ -8,13 +8,13 @@
 
 import UIKit
 
-public protocol PDFThumbnailViewControllerDelegate {
-    func thumbnailCollection(_ collection: PDFThumbnailViewController, didSelect page: Int)
+public protocol UXMThumbnailViewControllerDelegate {
+    func thumbnailCollection(_ collection: UXMThumbnailViewController, didSelect page: Int)
 }
 
-open class PDFThumbnailViewController: UIViewController {
+open class UXMThumbnailViewController: UIViewController {
     
-    var document: PDFDocument!
+    var document: UXMPDFDocument!
     
     var collectionView: UICollectionView!
     private var flowLayout: UICollectionViewFlowLayout {
@@ -26,9 +26,9 @@ open class PDFThumbnailViewController: UIViewController {
         return layout
     }
     
-    public var delegate: PDFThumbnailViewControllerDelegate?
+    public var delegate: UXMThumbnailViewControllerDelegate?
 
-    public init(document: PDFDocument) {
+    public init(document: UXMPDFDocument) {
         super.init(nibName: nil, bundle: nil)
         self.document = document
     }
@@ -43,7 +43,7 @@ open class PDFThumbnailViewController: UIViewController {
         collectionView.delegate = self
         collectionView.dataSource = self
         
-        self.collectionView.register(PDFThumbnailViewCell.self, forCellWithReuseIdentifier: "ThumbnailCell")
+        self.collectionView.register(UXMThumbnailViewCell.self, forCellWithReuseIdentifier: "ThumbnailCell")
 
         self.setupUI()
     }
@@ -55,7 +55,7 @@ open class PDFThumbnailViewController: UIViewController {
         self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Done",
                                                                 style: .plain,
                                                                 target: self,
-                                                                action: #selector(PDFThumbnailViewController.tappedDone))
+                                                                action: #selector(UXMThumbnailViewController.tappedDone))
         view.addSubview(collectionView)
         
         collectionView.backgroundColor = UIColor.white
@@ -72,7 +72,7 @@ open class PDFThumbnailViewController: UIViewController {
     }
 }
 
-extension PDFThumbnailViewController: UICollectionViewDataSource {
+extension UXMThumbnailViewController: UICollectionViewDataSource {
     public func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 1
     }
@@ -86,7 +86,7 @@ extension PDFThumbnailViewController: UICollectionViewDataSource {
     
     public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         
-        let cell = self.collectionView.dequeueReusableCell(withReuseIdentifier: "ThumbnailCell", for: indexPath) as! PDFThumbnailViewCell
+        let cell = self.collectionView.dequeueReusableCell(withReuseIdentifier: "ThumbnailCell", for: indexPath) as! UXMThumbnailViewCell
 
         let page = indexPath.row + 1
         cell.configure(document: document, page: page)
@@ -95,14 +95,14 @@ extension PDFThumbnailViewController: UICollectionViewDataSource {
     }
 }
 
-extension PDFThumbnailViewController: UICollectionViewDelegate {
+extension UXMThumbnailViewController: UICollectionViewDelegate {
     
     public func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         self.delegate?.thumbnailCollection(self, didSelect: indexPath.row + 1)
     }
 }
 
-extension PDFThumbnailViewController: UICollectionViewDelegateFlowLayout {
+extension UXMThumbnailViewController: UICollectionViewDelegateFlowLayout {
     public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         
         let bounds = document.boundsForPDFPage(indexPath.row + 1)
diff --git a/Pod/Classes/TextParser/PDFTextParser.swift b/Pod/Classes/TextParser/UXMTextParser.swift
similarity index 84%
rename from Pod/Classes/TextParser/PDFTextParser.swift
rename to Pod/Classes/TextParser/UXMTextParser.swift
index 4fa4002..2cce801 100644
--- a/Pod/Classes/TextParser/PDFTextParser.swift
+++ b/Pod/Classes/TextParser/UXMTextParser.swift
@@ -1,5 +1,5 @@
 //
-//  PDFTextParser.swift
+//  UXMTextParser.swift
 //  Pods
 //
 //  Created by Chris Anderson on 11/15/16.
@@ -8,22 +8,22 @@
 
 import UIKit
 
-enum PDFTextParserError: Error {
+enum UXMTextParserError: Error {
     case noPageRef
 }
 
-class PDFTextParser {
+class UXMTextParser {
     
-    var document: PDFDocument
+    var document: UXMPDFDocument
     var pageRef: CGPDFPage?
     
-    init(document: PDFDocument, page: Int) throws {
+    init(document: UXMPDFDocument, page: Int) throws {
         
         self.document = document
         self.pageRef = document.page(at: page)
         
         guard let pageRef = self.pageRef else {
-            throw PDFTextParserError.noPageRef
+            throw UXMTextParserError.noPageRef
         }
         var pageDict: CGPDFDictionaryRef? = pageRef.dictionary
         
diff --git a/Pod/Classes/View/ResizeableView.swift b/Pod/Classes/View/ResizeableView.swift
index cced88a..67162a7 100644
--- a/Pod/Classes/View/ResizeableView.swift
+++ b/Pod/Classes/View/ResizeableView.swift
@@ -344,7 +344,7 @@ open class ResizableView: UIView {
         self.resignFirstResponder()
     }
     
-    func menuActionDelete(_ sender: Any!) {
+    @objc func menuActionDelete(_ sender: Any!) {
         self.delegate?.resizableViewDidSelectAction(view: self, action: "delete")
     }
     
diff --git a/Pod/Classes/View/PDFBarButton.swift b/Pod/Classes/View/UXMBarButton.swift
similarity index 80%
rename from Pod/Classes/View/PDFBarButton.swift
rename to Pod/Classes/View/UXMBarButton.swift
index 9a49462..e482e04 100644
--- a/Pod/Classes/View/PDFBarButton.swift
+++ b/Pod/Classes/View/UXMBarButton.swift
@@ -1,5 +1,5 @@
 //
-//  PDFBarButton.swift
+//  UXMBarButton.swift
 //  Pods
 //
 //  Created by Ricardo Nunez on 11/11/16.
@@ -8,11 +8,11 @@
 
 import UIKit
 
-open class PDFBarButton: UIBarButtonItem {
+open class UXMBarButton: UIBarButtonItem {
     fileprivate let button = UIButton(frame: CGRect(x: 0, y: 0, width: 32, height: 32))
     fileprivate var toggled = false
     fileprivate lazy var defaultTint = UIColor.blue
-    fileprivate var block: ((PDFBarButton) -> ())?
+    fileprivate var block: ((UXMBarButton) -> ())?
     
     override open var tintColor: UIColor? {
         didSet {
@@ -25,7 +25,7 @@ open class PDFBarButton: UIBarButtonItem {
         toggled: Bool,
         target: AnyObject? = nil,
         action: Selector? = nil,
-        block: ((PDFBarButton) -> ())? = nil
+        block: ((UXMBarButton) -> ())? = nil
         ) {
         
         self.init()
@@ -39,7 +39,7 @@ open class PDFBarButton: UIBarButtonItem {
         self.action = action
         self.block = block
         
-        button.addTarget(self, action: #selector(PDFBarButton.tapped), for: .touchUpInside)
+        button.addTarget(self, action: #selector(UXMBarButton.tapped), for: .touchUpInside)
         button.setImage(image?.withRenderingMode(.alwaysTemplate), for: UIControlState())
     }
     
@@ -57,19 +57,19 @@ open class PDFBarButton: UIBarButtonItem {
         }
     }
     
-    func tapped() {
+    @objc func tapped() {
         let _ = self.target?.perform(self.action, with: self)
         self.block?(self)
     }
 }
 
-open class PDFAnnotationBarButton: PDFBarButton {
-    var annotationType: PDFAnnotation.Type? = nil
+open class PDFAnnotationBarButton: UXMBarButton {
+    var annotationType: UXMAnnotation.Type? = nil
     
     convenience init(
         toggled: Bool,
         type: PDFAnnotationButtonable.Type,
-        block: ((PDFBarButton) -> ())? = nil
+        block: ((UXMBarButton) -> ())? = nil
         ) {
         self.init(image: type.buttonImage, toggled: toggled, target: nil, action: nil, block: block)
         self.annotationType = type