diff --git a/hexpat-pickle-generic.cabal b/hexpat-pickle-generic.cabal
--- a/hexpat-pickle-generic.cabal
+++ b/hexpat-pickle-generic.cabal
@@ -1,5 +1,5 @@
 name:                  hexpat-pickle-generic
-version:               0.1.0
+version:               0.1.1
 synopsis:              Picklers for de/serialising Generic data types to and from XML
 license:               BSD3
 license-file:          LICENSE
diff --git a/src/Text/XML/Expat/Pickle/Generic.hs b/src/Text/XML/Expat/Pickle/Generic.hs
--- a/src/Text/XML/Expat/Pickle/Generic.hs
+++ b/src/Text/XML/Expat/Pickle/Generic.hs
@@ -25,16 +25,15 @@
       IsXML   (..)
 
     -- * Functions
-    , encode
-    , decode
-    , decodeEither
+    , encodeXML
+    , decodeXML
 
     -- * Re-exported Data Types
     , PU      (..)
 
     -- * Options
-    , Options (..)
-    , defaultOptions
+    , GenericXMLOptions (..)
+    , defaultXMLOptions
 
     -- * Generics
     , genericXMLPickler
@@ -70,34 +69,33 @@
 
     default xmlPickler :: (Generic a, GIsXML [UNode ByteString] (Rep a))
                       => PU [UNode ByteString] a
-    xmlPickler = genericXMLPickler defaultOptions
+    xmlPickler = genericXMLPickler defaultXMLOptions
 
 --
 -- Functions
 --
 
-encode :: IsXML a => a -> ByteString
-encode = pickleXML' (xpRoot xmlPickler)
-
-decode :: IsXML a => ByteString -> Maybe a
-decode = either (const Nothing) Just . decodeEither
+encodeXML :: IsXML a => a -> ByteString
+encodeXML = pickleXML' (xpRoot xmlPickler)
 
-decodeEither :: IsXML a => ByteString -> Either String a
-decodeEither = unpickleXML' defaultParseOptions (xpRoot xmlPickler)
+decodeXML :: IsXML a => ByteString -> Either String a
+decodeXML = unpickleXML' defaultParseOptions (xpRoot xmlPickler)
 
 --
 -- Defining Picklers
 --
 
-data Options = Options
+data GenericXMLOptions = GenericXMLOptions
     { constructorTagModifier :: String -> String
       -- ^ Function applied to constructor tags.
     , fieldLabelModifier     :: String -> String
       -- ^ Function applied to record field labels.
     }
 
-defaultOptions :: Options
-defaultOptions = Options id (dropWhile isLower)
+type Options = GenericXMLOptions
+
+defaultXMLOptions :: Options
+defaultXMLOptions = GenericXMLOptions id (dropWhile isLower)
 
 --
 -- Generics