diff --git a/lib/libhac/include/nn/hac/FileSystemAccessControlBinary.h b/lib/libhac/include/nn/hac/FileSystemAccessControlBinary.h
index 69f8c57..72901fd 100644
--- a/lib/libhac/include/nn/hac/FileSystemAccessControlBinary.h
+++ b/lib/libhac/include/nn/hac/FileSystemAccessControlBinary.h
@@ -9,7 +9,8 @@ namespace nn
 {
 namespace hac
 {
-	class FileSystemAccessControlBinary : public fnd::IByteModel
+	class FileSystemAccessControlBinary :
+		public fnd::IByteModel
 	{
 	public:
 		struct sSaveDataOwnerId
@@ -42,7 +43,7 @@ namespace hac
 		bool operator==(const FileSystemAccessControlBinary& other) const;
 		bool operator!=(const FileSystemAccessControlBinary& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* data, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/HierarchicalIntegrityHeader.h b/lib/libhac/include/nn/hac/HierarchicalIntegrityHeader.h
index 6a7ca66..340995a 100644
--- a/lib/libhac/include/nn/hac/HierarchicalIntegrityHeader.h
+++ b/lib/libhac/include/nn/hac/HierarchicalIntegrityHeader.h
@@ -43,7 +43,7 @@ namespace hac
 		bool operator==(const HierarchicalIntegrityHeader& other) const;
 		bool operator!=(const HierarchicalIntegrityHeader& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/HierarchicalSha256Header.h b/lib/libhac/include/nn/hac/HierarchicalSha256Header.h
index 37d0be6..0967e59 100644
--- a/lib/libhac/include/nn/hac/HierarchicalSha256Header.h
+++ b/lib/libhac/include/nn/hac/HierarchicalSha256Header.h
@@ -40,7 +40,7 @@ namespace hac
 		bool operator==(const HierarchicalSha256Header& other) const;
 		bool operator!=(const HierarchicalSha256Header& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>&  getBytes() const;
diff --git a/lib/libhac/include/nn/hac/KernelCapabilityBinary.h b/lib/libhac/include/nn/hac/KernelCapabilityBinary.h
index bcb095a..91ca53c 100644
--- a/lib/libhac/include/nn/hac/KernelCapabilityBinary.h
+++ b/lib/libhac/include/nn/hac/KernelCapabilityBinary.h
@@ -27,7 +27,7 @@ namespace hac
 		bool operator==(const KernelCapabilityBinary& other) const;
 		bool operator!=(const KernelCapabilityBinary& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		virtual const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/MetaBinary.h b/lib/libhac/include/nn/hac/MetaBinary.h
index b88e549..7bb4798 100644
--- a/lib/libhac/include/nn/hac/MetaBinary.h
+++ b/lib/libhac/include/nn/hac/MetaBinary.h
@@ -3,8 +3,8 @@
 #include <fnd/List.h>
 #include <fnd/IByteModel.h>
 #include <nn/hac/meta.h>
-#include <nn/hac/AccessControlInfoBinary.h>
-#include <nn/hac/AccessControlInfoDescBinary.h>
+#include <nn/hac/AccessControlInfo.h>
+#include <nn/hac/AccessControlInfoDesc.h>
 
 namespace nn
 {
@@ -21,7 +21,7 @@ namespace hac
 		bool operator==(const MetaBinary& other) const;
 		bool operator!=(const MetaBinary& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
@@ -53,11 +53,11 @@ namespace hac
 		const std::string& getProductCode() const;
 		void setProductCode(const std::string& product_code);
 
-		const AccessControlInfoBinary& getAci() const;
-		void setAci(const AccessControlInfoBinary& aci);
+		const AccessControlInfo& getAci() const;
+		void setAci(const AccessControlInfo& aci);
 
-		const AccessControlInfoDescBinary& getAcid() const;
-		void setAcid(const AccessControlInfoDescBinary& acid);
+		const AccessControlInfoDesc& getAcid() const;
+		void setAcid(const AccessControlInfoDesc& acid);
 	private:
 		const std::string kModuleName = "META_BINARY";
 
@@ -73,8 +73,8 @@ namespace hac
 		uint32_t mMainThreadStackSize;
 		std::string mName;
 		std::string mProductCode;
-		AccessControlInfoBinary mAci;
-		AccessControlInfoDescBinary mAcid;
+		AccessControlInfo mAci;
+		AccessControlInfoDesc mAcid;
 	};
 }
 }
\ No newline at end of file
diff --git a/lib/libhac/include/nn/hac/NcaHeader.h b/lib/libhac/include/nn/hac/NcaHeader.h
index a415984..6953fb1 100644
--- a/lib/libhac/include/nn/hac/NcaHeader.h
+++ b/lib/libhac/include/nn/hac/NcaHeader.h
@@ -7,7 +7,7 @@ namespace nn
 {
 namespace hac
 {
-	class NcaHeader : 
+	class NcaHeader :
 		public fnd::IByteModel
 	{
 	public:
@@ -55,7 +55,7 @@ namespace hac
 		bool operator==(const NcaHeader& other) const;
 		bool operator!=(const NcaHeader& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/NroHeader.h b/lib/libhac/include/nn/hac/NroHeader.h
index 5f3892d..d1865c1 100644
--- a/lib/libhac/include/nn/hac/NroHeader.h
+++ b/lib/libhac/include/nn/hac/NroHeader.h
@@ -8,7 +8,7 @@ namespace nn
 {
 namespace hac
 {
-	class NroHeader : 
+	class NroHeader :
 		public fnd::IByteModel
 	{
 	public:
@@ -82,7 +82,7 @@ namespace hac
 		bool operator==(const NroHeader& other) const;
 		bool operator!=(const NroHeader& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/NsoHeader.h b/lib/libhac/include/nn/hac/NsoHeader.h
index 5a6dabf..bc716fa 100644
--- a/lib/libhac/include/nn/hac/NsoHeader.h
+++ b/lib/libhac/include/nn/hac/NsoHeader.h
@@ -8,7 +8,7 @@ namespace nn
 {
 namespace hac
 {
-	class NsoHeader : 
+	class NsoHeader :
 		public fnd::IByteModel
 	{
 	public:
@@ -94,7 +94,7 @@ namespace hac
 		bool operator==(const NsoHeader& other) const;
 		bool operator!=(const NsoHeader& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/PfsHeader.h b/lib/libhac/include/nn/hac/PfsHeader.h
index 2bbac7b..89b94ac 100644
--- a/lib/libhac/include/nn/hac/PfsHeader.h
+++ b/lib/libhac/include/nn/hac/PfsHeader.h
@@ -69,7 +69,7 @@ namespace hac
 		bool operator==(const PfsHeader& other) const;
 		bool operator!=(const PfsHeader& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/ServiceAccessControlBinary.h b/lib/libhac/include/nn/hac/ServiceAccessControlBinary.h
index 56bded1..f2ef2ff 100644
--- a/lib/libhac/include/nn/hac/ServiceAccessControlBinary.h
+++ b/lib/libhac/include/nn/hac/ServiceAccessControlBinary.h
@@ -20,7 +20,7 @@ namespace hac
 		bool operator==(const ServiceAccessControlBinary& other) const;
 		bool operator!=(const ServiceAccessControlBinary& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/ServiceAccessControlEntry.h b/lib/libhac/include/nn/hac/ServiceAccessControlEntry.h
index fa3e339..5bc71e2 100644
--- a/lib/libhac/include/nn/hac/ServiceAccessControlEntry.h
+++ b/lib/libhac/include/nn/hac/ServiceAccessControlEntry.h
@@ -7,7 +7,7 @@ namespace nn
 {
 namespace hac
 {
-	class ServiceAccessControlEntry : 
+	class ServiceAccessControlEntry :
 		public fnd::IByteModel
 	{
 	public:
@@ -19,7 +19,7 @@ namespace hac
 		bool operator==(const ServiceAccessControlEntry& other) const;
 		bool operator!=(const ServiceAccessControlEntry& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;
diff --git a/lib/libhac/include/nn/hac/XciHeader.h b/lib/libhac/include/nn/hac/XciHeader.h
index 5c99276..05c48a6 100644
--- a/lib/libhac/include/nn/hac/XciHeader.h
+++ b/lib/libhac/include/nn/hac/XciHeader.h
@@ -7,7 +7,7 @@ namespace nn
 {
 namespace hac
 {
-	class XciHeader : 
+	class XciHeader :
 		public fnd::IByteModel
 	{
 	public:
@@ -18,7 +18,7 @@ namespace hac
 		bool operator==(const XciHeader& other) const;
 		bool operator!=(const XciHeader& other) const;
 
-		// export/import binary
+		// IByteModel
 		void toBytes();
 		void fromBytes(const byte_t* bytes, size_t len);
 		const fnd::Vec<byte_t>& getBytes() const;