diff --git a/hs-mesos.cabal b/hs-mesos.cabal
--- a/hs-mesos.cabal
+++ b/hs-mesos.cabal
@@ -1,5 +1,5 @@
 name:                hs-mesos
-version:             0.20.2.0
+version:             0.20.3.0
 
 description:         Bindings to the Apache Mesos platform.
                      .
diff --git a/src/System/Mesos/Raw/ExecutorInfo.hs b/src/System/Mesos/Raw/ExecutorInfo.hs
--- a/src/System/Mesos/Raw/ExecutorInfo.hs
+++ b/src/System/Mesos/Raw/ExecutorInfo.hs
@@ -55,7 +55,7 @@
     rps <- mapM cppValue $ executorInfoResources i
     (np, nl) <- maybeCString $ executorInfoName i
     (sp, sl) <- maybeCString $ executorInfoSource i
-    (dp, dl) <- maybeCString $ executorInfoData i
+    (dp, dl) <- maybeCString $ executorInfoData_ i
     (rs, rLen) <- arrayLen rps
     liftIO $ c_toExecutorInfo eidP fidP ciP ctrP rs (fromIntegral rLen) np (fromIntegral nl) sp (fromIntegral sl) dp (fromIntegral dl)
 
diff --git a/src/System/Mesos/Raw/TaskInfo.hs b/src/System/Mesos/Raw/TaskInfo.hs
--- a/src/System/Mesos/Raw/TaskInfo.hs
+++ b/src/System/Mesos/Raw/TaskInfo.hs
@@ -58,7 +58,7 @@
     cip <- maybe (return nullPtr) cppValue $ case taskInfoImplementation t of
                                                TaskCommand c -> Just c
                                                _ -> Nothing
-    (tdp, tdl) <- maybeCString $ taskInfoData t
+    (tdp, tdl) <- maybeCString $ taskInfoData_ t
     (rpp, rl) <- arrayLen rps
     ctrp <- maybe (return nullPtr) cppValue $ taskInfoContainer t
     hcp <- maybe (return nullPtr) cppValue $ taskInfoHealthCheck t
diff --git a/src/System/Mesos/Raw/TaskStatus.hs b/src/System/Mesos/Raw/TaskStatus.hs
--- a/src/System/Mesos/Raw/TaskStatus.hs
+++ b/src/System/Mesos/Raw/TaskStatus.hs
@@ -45,7 +45,7 @@
     tidP <- cppValue $ taskStatusTaskId s
     sidP <- maybe (return nullPtr) cppValue $ taskStatusSlaveId s
     (tmp, tml) <- maybeCString $ taskStatusMessage s
-    (tsd, tsl) <- maybeCString $ taskStatusData s
+    (tsd, tsl) <- maybeCString $ taskStatusData_ s
     eidP <- maybe (return nullPtr) cppValue $ taskStatusExecutorId s
     tsp <- alloc
     tsp' <- maybe (return nullPtr) (\x -> poke tsp (CDouble x) >> return tsp) $ taskStatusTimestamp s
diff --git a/src/System/Mesos/Types.hs b/src/System/Mesos/Types.hs
--- a/src/System/Mesos/Types.hs
+++ b/src/System/Mesos/Types.hs
@@ -259,7 +259,7 @@
   -- ^ Executor provided with a container will launch the container
   -- with the executor's 'CommandInfo' and we expect the container to
   -- act as a Mesos executor.
-  , executorInfoResources     :: ![Resource]
+  , executorInfoResources         :: ![Resource]
   , executorInfoName              :: !(Maybe ByteString)
   , executorInfoSource            :: !(Maybe ByteString)
   -- ^ Source is an identifier style string used by frameworks to track
@@ -269,7 +269,7 @@
   -- NOTE: Source is exposed alongside the resource usage of the
   -- executor via JSON on the slave. This allows users to import
   -- usage information into a time series database for monitoring.
-  , executorInfoData              :: !(Maybe ByteString)
+  , executorInfoData_             :: !(Maybe ByteString)
   }
   deriving (Show, Eq)
 
@@ -502,7 +502,7 @@
   , taskInfoSlaveId        :: !SlaveID
   , taskInfoResources      :: ![Resource]
   , taskInfoImplementation :: !TaskExecutionInfo
-  , taskInfoData           :: !(Maybe ByteString)
+  , taskInfoData_          :: !(Maybe ByteString)
   -- | Task provided with a container will launch the container as part
   -- of this task paired with the task's CommandInfo.
   , taskInfoContainer      :: !(Maybe ContainerInfo)
@@ -520,7 +520,7 @@
   { taskStatusTaskId     :: !TaskID
   , taskStatusState      :: !TaskState
   , taskStatusMessage    :: !(Maybe ByteString) -- ^ Possible message explaining state.
-  , taskStatusData       :: !(Maybe ByteString)
+  , taskStatusData_      :: !(Maybe ByteString)
   , taskStatusSlaveId    :: !(Maybe SlaveID)
   , taskStatusExecutorId :: !(Maybe ExecutorID)
   , taskStatusTimestamp  :: !(Maybe Double)