diff --git a/src/names/common.h b/src/names/common.h
index 9914fbfc70..61ad08297e 100644
--- a/src/names/common.h
+++ b/src/names/common.h
@@ -281,7 +281,7 @@ class CNameCache
       Serialize (Stream& s) const
     {
       /* Flip the byte order of nHeight to big endian.  */
-      const uint32_t nHeightFlipped = htobe32 (nHeight);
+      const uint32_t nHeightFlipped = htobe32_internal (nHeight);
 
       ::Serialize (s, nHeightFlipped);
       ::Serialize (s, name);
@@ -297,7 +297,7 @@ class CNameCache
       ::Unserialize (s, name);
 
       /* Unflip the byte order.  */
-      nHeight = be32toh (nHeightFlipped);
+      nHeight = be32toh_internal (nHeightFlipped);
     }
 
     friend inline bool
@@ -383,7 +383,7 @@ class CNameCache
   inline bool
   isDeleted (const valtype& name) const
   {
-    return (deleted.count (name) > 0); 
+    return (deleted.count (name) > 0);
   }
 
   /* Try to get a name's associated data.  This looks only