-#define CM_INET_NTOH_U32(_long) ntohl(_long)
-#define CM_INET_HTON_U32(_long) htonl(_long)
-#define CM_INET_NTOH_U16(_word) ntohs(_word)
-#define CM_INET_HTON_U16(_word) htons(_word)
-
-/* peeks a U8 from the given position */
-#define CM_INET_PEEK_U8(_sockFd, _fromAddr, _info, _pos, _octet, _ret) \
- _ret = cmInetPeek(_sockFd, _fromAddr, _info, _pos, sizeof(U8), &_octet)
+#define CM_INET_NTOH_UINT32(_long) ntohl(_long)
+#define CM_INET_HTON_UINT32(_long) htonl(_long)
+#define CM_INET_NTOH_UINT16(_word) ntohs(_word)
+#define CM_INET_HTON_UINT16(_word) htons(_word)
+
+/* peeks a uint8_t from the given position */
+#define CM_INET_PEEK_UINT8(_sockFd, _fromAddr, _info, _pos, _octet, _ret) \
+ _ret = cmInetPeek(_sockFd, _fromAddr, _info, _pos, sizeof(uint8_t), &_octet)