1 files changed, 3 insertions, 3 deletions

diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index d8f8d50..bae2538 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -126,10 +126,10 @@ buildKeyDB :: InputFileContext -> Maybe String -> KeyRingOperation
                                     ,{- hs        -} ({- hostdbs0 -}[Hosts.Hosts],
                                                       {- hostdbs  -}[Hosts.Hosts],
                                                       {- u1       -}Hosts.Hosts,
-                                                      {- gpgnames -}[(SockAddr, (KeyKey, KeyKey))],
+                                                      {- gpgnames -}[(SockAddr, ([ByteString],[ByteString]))],
                                                       {- outgoing_names -}[SockAddr])
                                     ,{- accs      -} Map.Map InputFile Access
-                                    ,{- doDecrypt -} PacketTranscoder
+                                    ,{- transcode -} PacketTranscoder
                                     ,{- unspilled -} Map.Map InputFile Message
                                     )
                                    ,{- report_imports -} [(FilePath,KikiReportAction)]))
@@ -544,7 +544,7 @@ generateInternals transcode mwk db gens = do
 mergeHostFiles :: KeyRingOperation -> KeyDB -> InputFileContext
      -> IO
           (KikiCondition
-             ( ( Map.Map [Char8.ByteString] KeyData
+             ( ( KeyDB
                , ( [Hosts.Hosts]
                  , [Hosts.Hosts]
                  , Hosts.Hosts