diff --git a/constants/SP2000.inc b/constants/SP2000.inc
index 3386451..840333f 100644
--- a/constants/SP2000.inc
+++ b/constants/SP2000.inc
@@ -1810,7 +1810,7 @@ ATAPI:
 .Nop			EQU #00
 .Reset			EQU #08
 .Packet			EQU #A0
-.IdentifyPackedDevice	EQU #A1
+.IdentifyPacketDevice	EQU #A1
 ;
 ATA:
 ; ATA-2 commands ************************
diff --git a/structures/FileSystem.inc b/structures/FileSystem.inc
index 163c932..e6e9b7e 100644
--- a/structures/FileSystem.inc
+++ b/structures/FileSystem.inc
@@ -175,19 +175,19 @@ BOOT_SECTOR			EQU #00
 
 ;
  STRUCT	CDFS_DIRECTORY_RECORD
-.NAME:				TEXT	8,{".      "," "} ; DIR_Name		#00 +00 NAME
-.EXT:				TEXT	3,{"  "," "}	  ; --//--//;		#08 +08 EXT
-.ATTRIBUT:			BYTE	#10		  ; DIR_Attr;		#0B +11 ATTRIBUT
-.RESERVED_NT:			BYTE	#00		  ; DIR_NTRes;		#0C +12 RESERVED
-.RESERVED_FAT32:		BYTE	#00		  ; DIR_CrtTimeHundth	#0D +13 Десятые доли секунды создания файла (0-1.99)
-.CREATE_TIME_FAT32:		WORD	#0000		  ; DIR_CrtTime		#0E +14 Время создания файла
-.CREATE_DATE_FAT32:		WORD	#0000		  ; DIR_CrtDate		#10 +16 Дата создания файла
-.LAST_ACCESS_DATE_FAT32:	WORD	#0000		  ; DIR_LstAccDate	#12 +18 Дата последнего доступа (r/w)
-.FIRST_CLUSTER_H:		WORD	#0000		  ; DIR_FstClusHI	#14 +20 START CLUSTER high	;!TODO fat32
-.TIME:				WORD	#0000		  ; DIR_WrtTime		#16 +22 Time of last write.
-.DATE:				WORD	#0000		  ; DIR_WrtDate		#18 +24 Date of last write.
-.FIRST_CLUSTER_L:		WORD	#0000		  ; DIR_FstClusLO	#1A +26 START CLUSTER low
-.F_SIZE:			DWORD	#00000000	  ; DIR_FileSize	#1C +28 SIZE FILE 
+; .NAME:				TEXT	8,{".      "," "} ; DIR_Name		#00 +00 NAME
+; .EXT:				TEXT	3,{"  "," "}	  ; --//--//;		#08 +08 EXT
+; .ATTRIBUT:			BYTE	#10		  ; DIR_Attr;		#0B +11 ATTRIBUT
+; .RESERVED_NT:			BYTE	#00		  ; DIR_NTRes;		#0C +12 RESERVED
+; .RESERVED_FAT32:		BYTE	#00		  ; DIR_CrtTimeHundth	#0D +13 Десятые доли секунды создания файла (0-1.99)
+; .CREATE_TIME_FAT32:		WORD	#0000		  ; DIR_CrtTime		#0E +14 Время создания файла
+; .CREATE_DATE_FAT32:		WORD	#0000		  ; DIR_CrtDate		#10 +16 Дата создания файла
+; .LAST_ACCESS_DATE_FAT32:	WORD	#0000		  ; DIR_LstAccDate	#12 +18 Дата последнего доступа (r/w)
+; .FIRST_CLUSTER_H:		WORD	#0000		  ; DIR_FstClusHI	#14 +20 START CLUSTER high	;!TODO fat32
+; .TIME:				WORD	#0000		  ; DIR_WrtTime		#16 +22 Time of last write.
+; .DATE:				WORD	#0000		  ; DIR_WrtDate		#18 +24 Date of last write.
+; .FIRST_CLUSTER_L:		WORD	#0000		  ; DIR_FstClusLO	#1A +26 START CLUSTER low
+; .F_SIZE:			DWORD	#00000000	  ; DIR_FileSize	#1C +28 SIZE FILE 
  ENDS
 ;
 
diff --git a/structures/Identify_ATA_Struct.inc b/structures/Identify_ATA_Struct.inc
index 281e751..3a6cc6f 100644
--- a/structures/Identify_ATA_Struct.inc
+++ b/structures/Identify_ATA_Struct.inc
@@ -235,10 +235,10 @@ DsmCap							WORD		; 105	210
 ;Reserved1 : 2
 PhysicalLogicalSectorSize				WORD		; 106	212
 InterSeekDelay						WORD		; 107	214
-WorldWideName[4]					BLOCK 8		; 108	216
-ReservedForWorldWideName128[4]				BLOCK 8		; 112	224
+WorldWideName						BLOCK 8		; 108	216
+ReservedForWorldWideName128				BLOCK 8		; 112	224
 ReservedForTlcTechnicalReport				WORD		; 116	232
-WordsPerLogicalSector[2]				DWORD		; 117	234
+WordsPerLogicalSector					DWORD		; 117	234
 
 ;ReservedForDrqTechnicalReport : 1
 ;WriteReadVerify : 1