diff --git a/Structs/Images.cs b/Structs/Images.cs
index b1db034..48aad8d 100644
--- a/Structs/Images.cs
+++ b/Structs/Images.cs
@@ -116,7 +116,7 @@ namespace Aaru.CommonTypes.Structs
     public struct Session
     {
         /// <summary>Session number, 1-started</summary>
-        public ushort SessionSequence;
+        public ushort Sequence;
         /// <summary>First track present on this session</summary>
         public uint StartTrack;
         /// <summary>Last track present on this session</summary>
@@ -130,42 +130,42 @@ namespace Aaru.CommonTypes.Structs
     /// <summary>Track defining structure.</summary>
     public class Track
     {
+        /// <summary>How many main channel / user data bytes are per sector in this track</summary>
+        public int BytesPerSector;
+        /// <summary>Information that does not find space in this struct</summary>
+        public string Description;
+        /// <summary>Track ending sector</summary>
+        public ulong EndSector;
+        /// <summary>Which file stores this track</summary>
+        public string File;
+        /// <summary>Starting at which byte is this track stored</summary>
+        public ulong FileOffset;
+        /// <summary>What kind of file is storing this track</summary>
+        public string FileType;
+        /// <summary>Which filter stores this track</summary>
+        public IFilter Filter;
         /// <summary>Indexes, 00 to 99 and sector offset</summary>
         public Dictionary<ushort, int> Indexes;
-        /// <summary>How many main channel / user data bytes are per sector in this track</summary>
-        public int TrackBytesPerSector;
-        /// <summary>Information that does not find space in this struct</summary>
-        public string TrackDescription;
-        /// <summary>Track ending sector</summary>
-        public ulong TrackEndSector;
-        /// <summary>Which file stores this track</summary>
-        public string TrackFile;
-        /// <summary>Starting at which byte is this track stored</summary>
-        public ulong TrackFileOffset;
-        /// <summary>What kind of file is storing this track</summary>
-        public string TrackFileType;
-        /// <summary>Which filter stores this track</summary>
-        public IFilter TrackFilter;
         /// <summary>Track pre-gap</summary>
-        public ulong TrackPregap;
+        public ulong Pregap;
         /// <summary>How many main channel bytes per sector are in the file with this track</summary>
-        public int TrackRawBytesPerSector;
+        public int RawBytesPerSector;
         /// <summary>Track number, 1-started</summary>
-        public uint TrackSequence;
+        public uint Sequence;
         /// <summary>Session this track belongs to</summary>
-        public ushort TrackSession;
+        public ushort Session;
         /// <summary>Track starting sector</summary>
-        public ulong TrackStartSector;
+        public ulong StartSector;
         /// <summary>Which file stores this track's subchannel</summary>
-        public string TrackSubchannelFile;
+        public string SubchannelFile;
         /// <summary>Which filter stores this track's subchannel</summary>
-        public IFilter TrackSubchannelFilter;
+        public IFilter SubchannelFilter;
         /// <summary>Starting at which byte are this track's subchannel stored</summary>
-        public ulong TrackSubchannelOffset;
+        public ulong SubchannelOffset;
         /// <summary>Type of subchannel stored for this track</summary>
-        public TrackSubchannelType TrackSubchannelType;
+        public TrackSubchannelType SubchannelType;
         /// <summary>Partition type</summary>
-        public TrackType TrackType;
+        public TrackType Type;
 
         /// <summary>Initializes an empty instance of this structure</summary>
         public Track() => Indexes = new Dictionary<ushort, int>();