This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 0e4a3bba3c88f73d261ec0e1e54a2d0863c7e13b
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Sep 25 17:17:34 2024 +0200

    Omit the `Specific` suffix in the name of classes that are already in a 
package named `specific`.
---
 .../apache/sis/storage/gsf/SBSensorSpecific.java   |  38 +++---
 .../org/apache/sis/storage/gsf/SensorSpecific.java | 130 ++++++++++-----------
 .../gsf/specific/{BDBSpecific.java => BDB.java}    |   4 +-
 .../{CmpSassSpecific.java => CmpSass.java}         |   4 +-
 .../specific/{DeltaTSpecific.java => DeltaT.java}  |   4 +-
 .../specific/{EM100Specific.java => EM100.java}    |   4 +-
 .../gsf/specific/{EM12Specific.java => EM12.java}  |   4 +-
 .../specific/{EM121ASpecific.java => EM121A.java}  |   4 +-
 .../gsf/specific/{EM3Specific.java => EM3.java}    |   4 +-
 .../{EM3ImagerySpecific.java => EM3Imagery.java}   |   4 +-
 .../specific/{EM3RawSpecific.java => EM3Raw.java}  |   4 +-
 .../gsf/specific/{EM4Specific.java => EM4.java}    |   4 +-
 .../{EM4ImagerySpecific.java => EM4Imagery.java}   |   4 +-
 .../specific/{EM950Specific.java => EM950.java}    |   4 +-
 .../{EchotracSpecific.java => Echotrac.java}       |   4 +-
 .../{ElacMkIISpecific.java => ElacMkII.java}       |   4 +-
 ...GeoSwathPlusSpecific.java => GeoSwathPlus.java} |   4 +-
 .../specific/{KMALLSpecific.java => KMALL.java}    |   4 +-
 ...KMALLImagerySpecific.java => KMALLImagery.java} |   4 +-
 ...Klein5410BssSpecific.java => Klein5410Bss.java} |   4 +-
 ...agerySpecific.java => Klein5410BssImagery.java} |   4 +-
 .../specific/{MGD77Specific.java => MGD77.java}    |   4 +-
 .../specific/{NOSHDBSpecific.java => NOSHDB.java}  |   4 +-
 .../{R2SonicSpecific.java => R2Sonic.java}         |   4 +-
 ...nicImagerySpecific.java => R2SonicImagery.java} |   4 +-
 .../{Reson7100Specific.java => Reson7100.java}     |   4 +-
 ...0ImagerySpecific.java => Reson7100Imagery.java} |   4 +-
 .../{Reson8100Specific.java => Reson8100.java}     |   4 +-
 ...0ImagerySpecific.java => Reson8100Imagery.java} |   4 +-
 ...ResonTSeriesSpecific.java => ResonTSeries.java} |   4 +-
 ...agerySpecific.java => ResonTSeriesImagery.java} |   4 +-
 .../specific/{SBAmpSpecific.java => SBAmp.java}    |   4 +-
 .../specific/{SBBDBSpecific.java => SBBDB.java}    |   4 +-
 .../{SBEchotracSpecific.java => SBEchotrac.java}   |   4 +-
 .../{SBMGD77Specific.java => SBMGD77.java}         |   4 +-
 .../{SBNOSHDBSpecific.java => SBNOSHDB.java}       |   4 +-
 .../{SBNavisoundSpecific.java => SBNavisound.java} |   4 +-
 .../specific/{SeaBatSpecific.java => SeaBat.java}  |   4 +-
 .../{SeaBat8101Specific.java => SeaBat8101.java}   |   4 +-
 .../{SeaBatIISpecific.java => SeaBatII.java}       |   4 +-
 .../{SeaBeam2112Specific.java => SeaBeam2112.java} |   4 +-
 .../{SeabeamSpecific.java => Seabeam.java}         |   4 +-
 .../specific/{SeamapSpecific.java => Seamap.java}  |   4 +-
 .../{TypeIIISpecific.java => TypeIII.java}         |   4 +-
 44 files changed, 168 insertions(+), 168 deletions(-)

diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SBSensorSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SBSensorSpecific.java
index bc8df7d0a3..9fda4613db 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SBSensorSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SBSensorSpecific.java
@@ -17,10 +17,10 @@
 package org.apache.sis.storage.gsf;
 
 import java.lang.foreign.*;
-import org.apache.sis.storage.gsf.specific.BDBSpecific;
-import org.apache.sis.storage.gsf.specific.EchotracSpecific;
-import org.apache.sis.storage.gsf.specific.MGD77Specific;
-import org.apache.sis.storage.gsf.specific.NOSHDBSpecific;
+import org.apache.sis.storage.gsf.specific.BDB;
+import org.apache.sis.storage.gsf.specific.Echotrac;
+import org.apache.sis.storage.gsf.specific.MGD77;
+import org.apache.sis.storage.gsf.specific.NOSHDB;
 
 
 /**
@@ -30,18 +30,18 @@ import org.apache.sis.storage.gsf.specific.NOSHDBSpecific;
 public final class SBSensorSpecific extends StructClass {
 
 
-    private static final GroupLayout LAYOUT_GSFECHOTRACSPECIFIC;
-    private static final GroupLayout LAYOUT_GSFBATHY2000SPECIFIC;
-    private static final GroupLayout LAYOUT_GSFMGD77SPECIFIC;
-    private static final GroupLayout LAYOUT_GSFBDBSPECIFIC;
-    private static final GroupLayout LAYOUT_GSFNOSHDBSPECIFIC;
+    private static final GroupLayout LAYOUT_GSFECHOTRAC;
+    private static final GroupLayout LAYOUT_GSFBATHY2000;
+    private static final GroupLayout LAYOUT_GSFMGD77;
+    private static final GroupLayout LAYOUT_GSFBDB;
+    private static final GroupLayout LAYOUT_GSFNOSHDB;
 
     static final GroupLayout LAYOUT = MemoryLayout.unionLayout(
-        LAYOUT_GSFECHOTRACSPECIFIC = 
EchotracSpecific.LAYOUT.withName("gsfEchotracSpecific"),
-        LAYOUT_GSFBATHY2000SPECIFIC = 
EchotracSpecific.LAYOUT.withName("gsfBathy2000Specific"),
-        LAYOUT_GSFMGD77SPECIFIC = 
MGD77Specific.LAYOUT.withName("gsfMGD77Specific"),
-        LAYOUT_GSFBDBSPECIFIC = BDBSpecific.LAYOUT.withName("gsfBDBSpecific"),
-        LAYOUT_GSFNOSHDBSPECIFIC = 
NOSHDBSpecific.LAYOUT.withName("gsfNOSHDBSpecific")
+        LAYOUT_GSFECHOTRAC = Echotrac.LAYOUT.withName("gsfEchotracSpecific"),
+        LAYOUT_GSFBATHY2000 = Echotrac.LAYOUT.withName("gsfBathy2000Specific"),
+        LAYOUT_GSFMGD77 = MGD77.LAYOUT.withName("gsfMGD77Specific"),
+        LAYOUT_GSFBDB = BDB.LAYOUT.withName("gsfBDBSpecific"),
+        LAYOUT_GSFNOSHDB = NOSHDB.LAYOUT.withName("gsfNOSHDBSpecific")
     ).withName("t_gsfSBSensorSpecific");
 
     SBSensorSpecific(MemorySegment struct) {
@@ -60,7 +60,7 @@ public final class SBSensorSpecific extends StructClass {
      * }
      */
     public MemorySegment gsfEchotracSpecific() {
-        return struct.asSlice(0, LAYOUT_GSFECHOTRACSPECIFIC.byteSize());
+        return struct.asSlice(0, LAYOUT_GSFECHOTRAC.byteSize());
     }
 
     /**
@@ -70,7 +70,7 @@ public final class SBSensorSpecific extends StructClass {
      * }
      */
     public MemorySegment gsfBathy2000Specific() {
-        return struct.asSlice(0, LAYOUT_GSFBATHY2000SPECIFIC.byteSize());
+        return struct.asSlice(0, LAYOUT_GSFBATHY2000.byteSize());
     }
 
     /**
@@ -80,7 +80,7 @@ public final class SBSensorSpecific extends StructClass {
      * }
      */
     public MemorySegment gsfMGD77Specific() {
-        return struct.asSlice(0, LAYOUT_GSFMGD77SPECIFIC.byteSize());
+        return struct.asSlice(0, LAYOUT_GSFMGD77.byteSize());
     }
 
     /**
@@ -90,7 +90,7 @@ public final class SBSensorSpecific extends StructClass {
      * }
      */
     public MemorySegment gsfBDBSpecific() {
-        return struct.asSlice(0, LAYOUT_GSFBDBSPECIFIC.byteSize());
+        return struct.asSlice(0, LAYOUT_GSFBDB.byteSize());
     }
 
     /**
@@ -100,6 +100,6 @@ public final class SBSensorSpecific extends StructClass {
      * }
      */
     public MemorySegment gsfNOSHDBSpecific() {
-        return struct.asSlice(0, LAYOUT_GSFNOSHDBSPECIFIC.byteSize());
+        return struct.asSlice(0, LAYOUT_GSFNOSHDB.byteSize());
     }
 }
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorSpecific.java
index b5844d3f30..3c0e5ddec4 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorSpecific.java
@@ -17,36 +17,36 @@
 package org.apache.sis.storage.gsf;
 
 import java.lang.foreign.*;
-import org.apache.sis.storage.gsf.specific.CmpSassSpecific;
-import org.apache.sis.storage.gsf.specific.DeltaTSpecific;
-import org.apache.sis.storage.gsf.specific.EM100Specific;
-import org.apache.sis.storage.gsf.specific.EM121ASpecific;
-import org.apache.sis.storage.gsf.specific.EM12Specific;
-import org.apache.sis.storage.gsf.specific.EM3RawSpecific;
-import org.apache.sis.storage.gsf.specific.EM3Specific;
-import org.apache.sis.storage.gsf.specific.EM4Specific;
-import org.apache.sis.storage.gsf.specific.EM950Specific;
-import org.apache.sis.storage.gsf.specific.ElacMkIISpecific;
-import org.apache.sis.storage.gsf.specific.GeoSwathPlusSpecific;
-import org.apache.sis.storage.gsf.specific.KMALLSpecific;
-import org.apache.sis.storage.gsf.specific.Klein5410BssSpecific;
-import org.apache.sis.storage.gsf.specific.R2SonicSpecific;
-import org.apache.sis.storage.gsf.specific.Reson7100Specific;
-import org.apache.sis.storage.gsf.specific.Reson8100Specific;
-import org.apache.sis.storage.gsf.specific.ResonTSeriesSpecific;
-import org.apache.sis.storage.gsf.specific.SBAmpSpecific;
-import org.apache.sis.storage.gsf.specific.SBBDBSpecific;
-import org.apache.sis.storage.gsf.specific.SBEchotracSpecific;
-import org.apache.sis.storage.gsf.specific.SBMGD77Specific;
-import org.apache.sis.storage.gsf.specific.SBNOSHDBSpecific;
-import org.apache.sis.storage.gsf.specific.SBNavisoundSpecific;
-import org.apache.sis.storage.gsf.specific.SeaBat8101Specific;
-import org.apache.sis.storage.gsf.specific.SeaBatIISpecific;
-import org.apache.sis.storage.gsf.specific.SeaBatSpecific;
-import org.apache.sis.storage.gsf.specific.SeaBeam2112Specific;
-import org.apache.sis.storage.gsf.specific.SeabeamSpecific;
-import org.apache.sis.storage.gsf.specific.SeamapSpecific;
-import org.apache.sis.storage.gsf.specific.TypeIIISpecific;
+import org.apache.sis.storage.gsf.specific.CmpSass;
+import org.apache.sis.storage.gsf.specific.DeltaT;
+import org.apache.sis.storage.gsf.specific.EM100;
+import org.apache.sis.storage.gsf.specific.EM121A;
+import org.apache.sis.storage.gsf.specific.EM12;
+import org.apache.sis.storage.gsf.specific.EM3Raw;
+import org.apache.sis.storage.gsf.specific.EM3;
+import org.apache.sis.storage.gsf.specific.EM4;
+import org.apache.sis.storage.gsf.specific.EM950;
+import org.apache.sis.storage.gsf.specific.ElacMkII;
+import org.apache.sis.storage.gsf.specific.GeoSwathPlus;
+import org.apache.sis.storage.gsf.specific.KMALL;
+import org.apache.sis.storage.gsf.specific.Klein5410Bss;
+import org.apache.sis.storage.gsf.specific.R2Sonic;
+import org.apache.sis.storage.gsf.specific.Reson7100;
+import org.apache.sis.storage.gsf.specific.Reson8100;
+import org.apache.sis.storage.gsf.specific.ResonTSeries;
+import org.apache.sis.storage.gsf.specific.SBAmp;
+import org.apache.sis.storage.gsf.specific.SBBDB;
+import org.apache.sis.storage.gsf.specific.SBEchotrac;
+import org.apache.sis.storage.gsf.specific.SBMGD77;
+import org.apache.sis.storage.gsf.specific.SBNOSHDB;
+import org.apache.sis.storage.gsf.specific.SBNavisound;
+import org.apache.sis.storage.gsf.specific.SeaBat8101;
+import org.apache.sis.storage.gsf.specific.SeaBatII;
+import org.apache.sis.storage.gsf.specific.SeaBat;
+import org.apache.sis.storage.gsf.specific.SeaBeam2112;
+import org.apache.sis.storage.gsf.specific.Seabeam;
+import org.apache.sis.storage.gsf.specific.Seamap;
+import org.apache.sis.storage.gsf.specific.TypeIII;
 
 
 /**
@@ -56,41 +56,41 @@ import org.apache.sis.storage.gsf.specific.TypeIIISpecific;
 public final class SensorSpecific extends StructClass {
 
     static final GroupLayout LAYOUT = MemoryLayout.unionLayout(
-        SeabeamSpecific.LAYOUT.withName("gsfSeaBeamSpecific"),
-        EM100Specific.LAYOUT.withName("gsfEM100Specific"),
-        EM121ASpecific.LAYOUT.withName("gsfEM121ASpecific"),
-        EM121ASpecific.LAYOUT.withName("gsfEM121Specific"),
-        SeaBatSpecific.LAYOUT.withName("gsfSeaBatSpecific"),
-        EM950Specific.LAYOUT.withName("gsfEM950Specific"),
-        EM950Specific.LAYOUT.withName("gsfEM1000Specific"),
-        SeamapSpecific.LAYOUT.withName("gsfSeamapSpecific"),
-        TypeIIISpecific.LAYOUT.withName("gsfTypeIIISeaBeamSpecific"),
-        TypeIIISpecific.LAYOUT.withName("gsfSASSSpecific"),
-        CmpSassSpecific.LAYOUT.withName("gsfCmpSassSpecific"),
-        SBAmpSpecific.LAYOUT.withName("gsfSBAmpSpecific"),
-        SeaBatIISpecific.LAYOUT.withName("gsfSeaBatIISpecific"),
-        SeaBat8101Specific.LAYOUT.withName("gsfSeaBat8101Specific"),
-        SeaBeam2112Specific.LAYOUT.withName("gsfSeaBeam2112Specific"),
-        ElacMkIISpecific.LAYOUT.withName("gsfElacMkIISpecific"),
-        EM3Specific.LAYOUT.withName("gsfEM3Specific"),
-        EM3RawSpecific.LAYOUT.withName("gsfEM3RawSpecific"),
-        Reson8100Specific.LAYOUT.withName("gsfReson8100Specific"),
-        Reson7100Specific.LAYOUT.withName("gsfReson7100Specific"),
-        ResonTSeriesSpecific.LAYOUT.withName("gsfResonTSeriesSpecific"),
-        EM4Specific.LAYOUT.withName("gsfEM4Specific"),
-        GeoSwathPlusSpecific.LAYOUT.withName("gsfGeoSwathPlusSpecific"),
-        Klein5410BssSpecific.LAYOUT.withName("gsfKlein5410BssSpecific"),
-        DeltaTSpecific.LAYOUT.withName("gsfDeltaTSpecific"),
-        EM12Specific.LAYOUT.withName("gsfEM12Specific"),
-        R2SonicSpecific.LAYOUT.withName("gsfR2SonicSpecific"),
-        KMALLSpecific.LAYOUT.withName("gsfKMALLSpecific"),
-        SBEchotracSpecific.LAYOUT.withName("gsfSBEchotracSpecific"),
-        SBEchotracSpecific.LAYOUT.withName("gsfSBBathy2000Specific"),
-        SBMGD77Specific.LAYOUT.withName("gsfSBMGD77Specific"),
-        SBBDBSpecific.LAYOUT.withName("gsfSBBDBSpecific"),
-        SBNOSHDBSpecific.LAYOUT.withName("gsfSBNOSHDBSpecific"),
-        SBEchotracSpecific.LAYOUT.withName("gsfSBPDDSpecific"),
-        SBNavisoundSpecific.LAYOUT.withName("gsfSBNavisoundSpecific")
+        Seabeam.LAYOUT.withName("gsfSeaBeamSpecific"),
+        EM100.LAYOUT.withName("gsfEM100Specific"),
+        EM121A.LAYOUT.withName("gsfEM121ASpecific"),
+        EM121A.LAYOUT.withName("gsfEM121Specific"),
+        SeaBat.LAYOUT.withName("gsfSeaBatSpecific"),
+        EM950.LAYOUT.withName("gsfEM950Specific"),
+        EM950.LAYOUT.withName("gsfEM1000Specific"),
+        Seamap.LAYOUT.withName("gsfSeamapSpecific"),
+        TypeIII.LAYOUT.withName("gsfTypeIIISeaBeamSpecific"),
+        TypeIII.LAYOUT.withName("gsfSASSSpecific"),
+        CmpSass.LAYOUT.withName("gsfCmpSassSpecific"),
+        SBAmp.LAYOUT.withName("gsfSBAmpSpecific"),
+        SeaBatII.LAYOUT.withName("gsfSeaBatIISpecific"),
+        SeaBat8101.LAYOUT.withName("gsfSeaBat8101Specific"),
+        SeaBeam2112.LAYOUT.withName("gsfSeaBeam2112Specific"),
+        ElacMkII.LAYOUT.withName("gsfElacMkIISpecific"),
+        EM3.LAYOUT.withName("gsfEM3Specific"),
+        EM3Raw.LAYOUT.withName("gsfEM3RawSpecific"),
+        Reson8100.LAYOUT.withName("gsfReson8100Specific"),
+        Reson7100.LAYOUT.withName("gsfReson7100Specific"),
+        ResonTSeries.LAYOUT.withName("gsfResonTSeriesSpecific"),
+        EM4.LAYOUT.withName("gsfEM4Specific"),
+        GeoSwathPlus.LAYOUT.withName("gsfGeoSwathPlusSpecific"),
+        Klein5410Bss.LAYOUT.withName("gsfKlein5410BssSpecific"),
+        DeltaT.LAYOUT.withName("gsfDeltaTSpecific"),
+        EM12.LAYOUT.withName("gsfEM12Specific"),
+        R2Sonic.LAYOUT.withName("gsfR2SonicSpecific"),
+        KMALL.LAYOUT.withName("gsfKMALLSpecific"),
+        SBEchotrac.LAYOUT.withName("gsfSBEchotracSpecific"),
+        SBEchotrac.LAYOUT.withName("gsfSBBathy2000Specific"),
+        SBMGD77.LAYOUT.withName("gsfSBMGD77Specific"),
+        SBBDB.LAYOUT.withName("gsfSBBDBSpecific"),
+        SBNOSHDB.LAYOUT.withName("gsfSBNOSHDBSpecific"),
+        SBEchotrac.LAYOUT.withName("gsfSBPDDSpecific"),
+        SBNavisound.LAYOUT.withName("gsfSBNavisoundSpecific")
     ).withName("t_gsfSensorSpecific");
 
     SensorSpecific(MemorySegment struct) {
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDBSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDB.java
similarity index 97%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDBSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDB.java
index 5dcb6cbb42..c83d3f4eb1 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDBSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDB.java
@@ -26,7 +26,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class BDBSpecific extends StructClass {
+public final class BDB extends StructClass {
     private static final OfInt LAYOUT_DOC_NO;
     private static final OfByte LAYOUT_EVAL;
     private static final OfByte LAYOUT_CLASSIFICATION;
@@ -45,7 +45,7 @@ public final class BDBSpecific extends StructClass {
         MemoryLayout.paddingLayout(2)
     ).withName("t_gsfBDBSpecific");
 
-    public BDBSpecific(MemorySegment struct) {
+    public BDB(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSassSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSass.java
similarity index 94%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSassSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSass.java
index ca924af70e..66b090ef34 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSassSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSass.java
@@ -26,7 +26,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class CmpSassSpecific extends StructClass {
+public final class CmpSass extends StructClass {
     private static final OfDouble LAYOUT_LFREQ;
     private static final OfDouble LAYOUT_LNTENS;
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
@@ -34,7 +34,7 @@ public final class CmpSassSpecific extends StructClass {
         LAYOUT_LNTENS = GSF.C_DOUBLE.withName("lntens")
     ).withName("t_gsfCmpSassSpecific");
 
-    public CmpSassSpecific(MemorySegment struct) {
+    public CmpSass(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaTSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaT.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaTSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaT.java
index b7113e442e..6672e066bc 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaTSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaT.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.gsf.TimeSpec;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class DeltaTSpecific extends StructClass {
+public final class DeltaT extends StructClass {
     private static final SequenceLayout LAYOUT_DECODE_FILE_TYPE;
     private static final OfByte LAYOUT_VERSION;
     private static final OfInt LAYOUT_PING_BYTE_SIZE;
@@ -97,7 +97,7 @@ public final class DeltaTSpecific extends StructClass {
         LAYOUT_SPARSE = MemoryLayout.sequenceLayout(32, 
GSF.C_CHAR).withName("spare")
     ).withName("t_gsfDeltaTSpecific");
 
-    public DeltaTSpecific(MemorySegment struct) {
+    public DeltaT(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100.java
similarity index 97%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100.java
index d32dd2c708..1e6b9a7438 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100.java
@@ -26,7 +26,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM100Specific extends StructClass {
+public final class EM100 extends StructClass {
     private static final OfDouble LAYOUT_SHIP_PITCH;
     private static final OfDouble LAYOUT_TRANSDUCER_PITCH;
     private static final OfInt LAYOUT_MODE;
@@ -47,7 +47,7 @@ public final class EM100Specific extends StructClass {
         LAYOUT_COUNTER = GSF.C_INT.withName("counter")
     ).withName("t_gsfEM100Specific");
 
-    public EM100Specific(MemorySegment struct) {
+    public EM100(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12.java
index eea8596b3f..565877ca35 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM12Specific extends StructClass {
+public final class EM12 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("ping_number"),
         GSF.C_INT.withName("resolution"),
@@ -40,7 +40,7 @@ public final class EM12Specific extends StructClass {
         MemoryLayout.paddingLayout(4)
     ).withName("t_gsfEM12Specific");
 
-    public EM12Specific(MemorySegment struct) {
+    public EM12(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121ASpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121A.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121ASpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121A.java
index 171cb264f8..8258a53de7 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121ASpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121A.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM121ASpecific extends StructClass {
+public final class EM121A extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("ping_number"),
         GSF.C_INT.withName("mode"),
@@ -40,7 +40,7 @@ public final class EM121ASpecific extends StructClass {
         GSF.C_DOUBLE.withName("surface_velocity")
     ).withName("t_gsfEM121ASpecific");
 
-    public EM121ASpecific(MemorySegment struct) {
+    public EM121A(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3.java
index e834c0aacc..3598fe7530 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM3Specific extends StructClass {
+public final class EM3 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("model_number"),
         GSF.C_INT.withName("ping_number"),
@@ -44,7 +44,7 @@ public final class EM3Specific extends StructClass {
         MemoryLayout.sequenceLayout(2, EM3RunTime.LAYOUT).withName("run_time")
     ).withName("t_gsfEM3Specific");
 
-    public EM3Specific(MemorySegment struct) {
+    public EM3(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3ImagerySpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Imagery.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3ImagerySpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Imagery.java
index 9d1c129acd..f402e6efbb 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3ImagerySpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Imagery.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM3ImagerySpecific extends StructClass {
+public final class EM3Imagery extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("range_norm"),
         GSF.C_SHORT.withName("start_tvg_ramp"),
@@ -41,7 +41,7 @@ public final class EM3ImagerySpecific extends StructClass {
         MemoryLayout.sequenceLayout(4, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfEM3ImagerySpecific");
 
-    public EM3ImagerySpecific(MemorySegment struct) {
+    public EM3Imagery(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Raw.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Raw.java
index 3979fdd20c..deee2d8cab 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Raw.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM3RawSpecific extends StructClass {
+public final class EM3Raw extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("model_number"),
         GSF.C_INT.withName("ping_counter"),
@@ -50,7 +50,7 @@ public final class EM3RawSpecific extends StructClass {
         EMPUStatus.LAYOUT.withName("pu_status")
     ).withName("t_gsfEM3RawSpecific");
 
-    public EM3RawSpecific(MemorySegment struct) {
+    public EM3Raw(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4.java
index 534c4e2b55..32baa078b4 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM4Specific extends StructClass {
+public final class EM4 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("model_number"),
         GSF.C_INT.withName("ping_counter"),
@@ -51,7 +51,7 @@ public final class EM4Specific extends StructClass {
         EMPUStatus.LAYOUT.withName("pu_status")
     ).withName("t_gsfEM4Specific");
 
-    public EM4Specific(MemorySegment struct) {
+    public EM4(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4ImagerySpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Imagery.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4ImagerySpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Imagery.java
index 5472d74846..86f2955f04 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4ImagerySpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Imagery.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM4ImagerySpecific extends StructClass {
+public final class EM4Imagery extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_DOUBLE.withName("sampling_frequency"),
         GSF.C_DOUBLE.withName("mean_absorption"),
@@ -46,7 +46,7 @@ public final class EM4ImagerySpecific extends StructClass {
         MemoryLayout.sequenceLayout(20, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfEM4ImagerySpecific");
 
-    public EM4ImagerySpecific(MemorySegment struct) {
+    public EM4Imagery(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950.java
index f24e9d76c5..08ce56bbcd 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EM950Specific extends StructClass {
+public final class EM950 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("ping_number"),
         GSF.C_INT.withName("mode"),
@@ -38,7 +38,7 @@ public final class EM950Specific extends StructClass {
         GSF.C_DOUBLE.withName("surface_velocity")
     ).withName("t_gsfEM950Specific");
 
-    public EM950Specific(MemorySegment struct) {
+    public EM950(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EchotracSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Echotrac.java
similarity index 96%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EchotracSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Echotrac.java
index d20ac6006e..84a8b9d188 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EchotracSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Echotrac.java
@@ -27,14 +27,14 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class EchotracSpecific extends StructClass {
+public final class Echotrac extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("navigation_error"),
         GSF.C_SHORT.withName("mpp_source"),
         GSF.C_SHORT.withName("tide_source")
     ).withName("t_gsfEchotracSpecific");
 
-    public EchotracSpecific(MemorySegment struct) {
+    public Echotrac(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkIISpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkII.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkIISpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkII.java
index 6cdb980a4e..601efd3bb4 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkIISpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkII.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class ElacMkIISpecific extends StructClass {
+public final class ElacMkII extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("mode"),
         GSF.C_INT.withName("ping_num"),
@@ -38,7 +38,7 @@ public final class ElacMkIISpecific extends StructClass {
         GSF.C_INT.withName("reserved")
     ).withName("t_gsfElacMkIISpecific");
 
-    public ElacMkIISpecific(MemorySegment struct) {
+    public ElacMkII(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlusSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlus.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlusSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlus.java
index 4c6de0296b..916132ba93 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlusSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlus.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class GeoSwathPlusSpecific extends StructClass {
+public final class GeoSwathPlus extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("data_source"),
         GSF.C_INT.withName("side"),
@@ -61,7 +61,7 @@ public final class GeoSwathPlusSpecific extends StructClass {
         MemoryLayout.sequenceLayout(32, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfGeoSwathPlusSpecific");
 
-    public GeoSwathPlusSpecific(MemorySegment struct) {
+    public GeoSwathPlus(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALL.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALL.java
index 22826407f5..dcdff1f13c 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALL.java
@@ -26,7 +26,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class KMALLSpecific extends StructClass {
+public final class KMALL extends StructClass {
     private static final OfInt LAYOUT_GSFKMALLVERSION;
     private static final OfInt LAYOUT_DGMTYPE;
     private static final OfInt LAYOUT_DGMVERSION;
@@ -190,7 +190,7 @@ public final class KMALLSpecific extends StructClass {
     ).withName("t_gsfKMALLSpecific");
 
 
-    public KMALLSpecific(MemorySegment struct) {
+    public KMALL(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagerySpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagery.java
similarity index 95%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagerySpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagery.java
index 6687873f02..dd564a0719 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagerySpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagery.java
@@ -27,12 +27,12 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class KMALLImagerySpecific extends StructClass {
+public final class KMALLImagery extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         MemoryLayout.sequenceLayout(64, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfKMALLImagerySpecific");
 
-    public KMALLImagerySpecific(MemorySegment struct) {
+    public KMALLImagery(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410Bss.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410Bss.java
index 7d237a49a2..16fea2cd01 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410Bss.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class Klein5410BssSpecific extends StructClass {
+public final class Klein5410Bss extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("data_source"),
         GSF.C_INT.withName("side"),
@@ -52,7 +52,7 @@ public final class Klein5410BssSpecific extends StructClass {
         MemoryLayout.paddingLayout(4)
     ).withName("t_gsfKlein5410BssSpecific");
 
-    public Klein5410BssSpecific(MemorySegment struct) {
+    public Klein5410Bss(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagerySpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagery.java
similarity index 97%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagerySpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagery.java
index af171a5079..9768922949 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagerySpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagery.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class Klein5410BssImagerySpecific extends StructClass {
+public final class Klein5410BssImagery extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("res_mode"),
         GSF.C_INT.withName("tvg_page"),
@@ -36,7 +36,7 @@ public final class Klein5410BssImagerySpecific extends 
StructClass {
         MemoryLayout.sequenceLayout(4, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfKlein5410BssImagerySpecific");
 
-    public Klein5410BssImagerySpecific(MemorySegment struct) {
+    public Klein5410BssImagery(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77.java
index 300d1675c3..4c2bc93227 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class MGD77Specific extends StructClass {
+public final class MGD77 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("time_zone_corr"),
         GSF.C_SHORT.withName("position_type_code"),
@@ -38,7 +38,7 @@ public final class MGD77Specific extends StructClass {
         GSF.C_DOUBLE.withName("travel_time")
     ).withName("t_gsfMGD77Specific");
 
-    public MGD77Specific(MemorySegment struct) {
+    public MGD77(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDB.java
similarity index 96%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDB.java
index 6e606e904f..afb92f19d6 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDB.java
@@ -27,13 +27,13 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class NOSHDBSpecific extends StructClass {
+public final class NOSHDB extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("type_code"),
         GSF.C_SHORT.withName("carto_code")
     ).withName("t_gsfNOSHDBSpecific");
 
-    public NOSHDBSpecific(MemorySegment struct) {
+    public NOSHDB(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2Sonic.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2Sonic.java
index f86f46848b..83ef6ef36f 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2Sonic.java
@@ -29,7 +29,7 @@ import org.apache.sis.storage.gsf.TimeSpec;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class R2SonicSpecific extends StructClass {
+public final class R2Sonic extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         MemoryLayout.sequenceLayout(12, GSF.C_CHAR).withName("model_number"),
         MemoryLayout.sequenceLayout(12, GSF.C_CHAR).withName("serial_number"),
@@ -65,7 +65,7 @@ public final class R2SonicSpecific extends StructClass {
         MemoryLayout.sequenceLayout(32, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfR2SonicSpecific");
 
-    public R2SonicSpecific(MemorySegment struct) {
+    public R2Sonic(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagerySpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagery.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagerySpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagery.java
index 2a4a0a3458..549c572e10 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagerySpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagery.java
@@ -29,7 +29,7 @@ import org.apache.sis.storage.gsf.TimeSpec;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class R2SonicImagerySpecific extends StructClass {
+public final class R2SonicImagery extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         MemoryLayout.sequenceLayout(12, GSF.C_CHAR).withName("model_number"),
         MemoryLayout.sequenceLayout(12, GSF.C_CHAR).withName("serial_number"),
@@ -61,7 +61,7 @@ public final class R2SonicImagerySpecific extends StructClass 
{
         MemoryLayout.sequenceLayout(32, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfR2SonicImagerySpecific");
 
-    public R2SonicImagerySpecific(MemorySegment struct) {
+    public R2SonicImagery(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100.java
index f86005bc5d..c310c834c2 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class Reson7100Specific extends StructClass {
+public final class Reson7100 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("protocol_version"),
         GSF.C_INT.withName("device_id"),
@@ -82,7 +82,7 @@ public final class Reson7100Specific extends StructClass {
         MemoryLayout.paddingLayout(6)
     ).withName("t_gsfReson7100Specific");
 
-    public Reson7100Specific(MemorySegment struct) {
+    public Reson7100(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100ImagerySpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Imagery.java
similarity index 96%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100ImagerySpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Imagery.java
index 637c543229..b69660023e 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100ImagerySpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Imagery.java
@@ -28,13 +28,13 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class Reson7100ImagerySpecific extends StructClass {
+public final class Reson7100Imagery extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("size"),
         MemoryLayout.sequenceLayout(64, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfReson7100ImagerySpecific");
 
-    public Reson7100ImagerySpecific(MemorySegment struct) {
+    public Reson7100Imagery(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100.java
index 50abf5cf60..3d281380dd 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class Reson8100Specific extends StructClass {
+public final class Reson8100 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("latency"),
         GSF.C_INT.withName("ping_number"),
@@ -62,7 +62,7 @@ public final class Reson8100Specific extends StructClass {
         MemoryLayout.paddingLayout(6)
     ).withName("t_gsfReson8100Specific");
 
-    public Reson8100Specific(MemorySegment struct) {
+    public Reson8100(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100ImagerySpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Imagery.java
similarity index 95%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100ImagerySpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Imagery.java
index 58b6c744e0..a0f71ad6c5 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100ImagerySpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Imagery.java
@@ -27,12 +27,12 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class Reson8100ImagerySpecific extends StructClass {
+public final class Reson8100Imagery extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         MemoryLayout.sequenceLayout(8, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfReson8100ImagerySpecific");
 
-    public Reson8100ImagerySpecific(MemorySegment struct) {
+    public Reson8100Imagery(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeries.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeries.java
index 8256ab5d5e..2123cf9ddf 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeries.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class ResonTSeriesSpecific extends StructClass {
+public final class ResonTSeries extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("protocol_version"),
         GSF.C_INT.withName("device_id"),
@@ -100,7 +100,7 @@ public final class ResonTSeriesSpecific extends StructClass 
{
         MemoryLayout.sequenceLayout(32, GSF.C_CHAR).withName("reserved_3")
     ).withName("t_gsfResonTSeriesSpecific");
 
-    public ResonTSeriesSpecific(MemorySegment struct) {
+    public ResonTSeries(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagerySpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagery.java
similarity index 96%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagerySpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagery.java
index b8e829f9b3..bb31622853 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagerySpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagery.java
@@ -28,13 +28,13 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class ResonTSeriesImagerySpecific extends StructClass {
+public final class ResonTSeriesImagery extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("size"),
         MemoryLayout.sequenceLayout(64, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfResonTSeriesImagerySpecific");
 
-    public ResonTSeriesImagerySpecific(MemorySegment struct) {
+    public ResonTSeriesImagery(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmpSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmp.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmpSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmp.java
index 2ebce7de57..366877fcf5 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmpSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmp.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SBAmpSpecific extends StructClass {
+public final class SBAmp extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_CHAR.withName("hour"),
         GSF.C_CHAR.withName("minute"),
@@ -38,7 +38,7 @@ public final class SBAmpSpecific extends StructClass {
         MemoryLayout.paddingLayout(2)
     ).withName("t_gsfSBAmpSpecific");
 
-    public SBAmpSpecific(MemorySegment struct) {
+    public SBAmp(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDBSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDB.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDBSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDB.java
index bb9cd1a68c..52c068f11e 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDBSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDB.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SBBDBSpecific extends StructClass {
+public final class SBBDB extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("doc_no"),
         GSF.C_CHAR.withName("eval"),
@@ -41,7 +41,7 @@ public final class SBBDBSpecific extends StructClass {
         MemoryLayout.paddingLayout(2)
     ).withName("t_gsfSBBDBSpecific");
 
-    public SBBDBSpecific(MemorySegment struct) {
+    public SBBDB(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotracSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotrac.java
similarity index 97%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotracSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotrac.java
index b41427123c..445a931fdb 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotracSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotrac.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SBEchotracSpecific extends StructClass {
+public final class SBEchotrac extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("navigation_error"),
         GSF.C_SHORT.withName("mpp_source"),
@@ -38,7 +38,7 @@ public final class SBEchotracSpecific extends StructClass {
         MemoryLayout.paddingLayout(4)
     ).withName("t_gsfSBEchotracSpecific");
 
-    public SBEchotracSpecific(MemorySegment struct) {
+    public SBEchotrac(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77.java
index 0060ffb8b7..ae53f5e1bf 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SBMGD77Specific extends StructClass {
+public final class SBMGD77 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("time_zone_corr"),
         GSF.C_SHORT.withName("position_type_code"),
@@ -41,7 +41,7 @@ public final class SBMGD77Specific extends StructClass {
         MemoryLayout.paddingLayout(4)
     ).withName("t_gsfSBMGD77Specific");
 
-    public SBMGD77Specific(MemorySegment struct) {
+    public SBMGD77(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDBSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDB.java
similarity index 97%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDBSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDB.java
index 3f43142aa0..dafa0f9ab3 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDBSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDB.java
@@ -28,14 +28,14 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SBNOSHDBSpecific extends StructClass {
+public final class SBNOSHDB extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("type_code"),
         GSF.C_SHORT.withName("carto_code"),
         MemoryLayout.sequenceLayout(4, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfSBNOSHDBSpecific");
 
-    public SBNOSHDBSpecific(MemorySegment struct) {
+    public SBNOSHDB(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisoundSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisound.java
similarity index 96%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisoundSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisound.java
index d0e033531d..896cb91ec8 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisoundSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisound.java
@@ -28,13 +28,13 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SBNavisoundSpecific extends StructClass {
+public final class SBNavisound extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_DOUBLE.withName("pulse_length"),
         MemoryLayout.sequenceLayout(8, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfSBNavisoundSpecific");
 
-    public SBNavisoundSpecific(MemorySegment struct) {
+    public SBNavisound(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat.java
index 15eeec2da9..0a1697691e 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SeaBatSpecific extends StructClass {
+public final class SeaBat extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("ping_number"),
         MemoryLayout.paddingLayout(4),
@@ -38,7 +38,7 @@ public final class SeaBatSpecific extends StructClass {
         GSF.C_INT.withName("receive_gain")
     ).withName("t_gsfSeaBatSpecific");
 
-    public SeaBatSpecific(MemorySegment struct) {
+    public SeaBat(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101.java
similarity index 99%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101.java
index f5783bd85a..f2051c4fe0 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SeaBat8101Specific extends StructClass {
+public final class SeaBat8101 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("ping_number"),
         MemoryLayout.paddingLayout(4),
@@ -51,7 +51,7 @@ public final class SeaBat8101Specific extends StructClass {
         MemoryLayout.sequenceLayout(4, GSF.C_CHAR).withName("spare")
     ).withName("t_gsfSeaBat8101Specific");
 
-    public SeaBat8101Specific(MemorySegment struct) {
+    public SeaBat8101(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatII.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatII.java
index 12fe22b08f..512771ffdd 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatII.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SeaBatIISpecific extends StructClass {
+public final class SeaBatII extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("ping_number"),
         MemoryLayout.paddingLayout(4),
@@ -43,7 +43,7 @@ public final class SeaBatIISpecific extends StructClass {
         MemoryLayout.paddingLayout(4)
     ).withName("t_gsfSeaBatIISpecific");
 
-    public SeaBatIISpecific(MemorySegment struct) {
+    public SeaBatII(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112Specific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112Specific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112.java
index f743f7284c..c87def5b4a 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112Specific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SeaBeam2112Specific extends StructClass {
+public final class SeaBeam2112 extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_INT.withName("mode"),
         MemoryLayout.paddingLayout(4),
@@ -44,7 +44,7 @@ public final class SeaBeam2112Specific extends StructClass {
         MemoryLayout.paddingLayout(5)
     ).withName("t_gsfSeaBeam2112Specific");
 
-    public SeaBeam2112Specific(MemorySegment struct) {
+    public SeaBeam2112(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeabeamSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Seabeam.java
similarity index 94%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeabeamSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Seabeam.java
index 7575233935..ad47dbc670 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeabeamSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Seabeam.java
@@ -27,12 +27,12 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SeabeamSpecific extends StructClass {
+public final class Seabeam extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("EclipseTime")
     ).withName("t_gsfSeabeamSpecific");
 
-    public SeabeamSpecific(MemorySegment struct) {
+    public Seabeam(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeamapSpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Seamap.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeamapSpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Seamap.java
index 731fa344ee..f38d3f9eec 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeamapSpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Seamap.java
@@ -28,7 +28,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class SeamapSpecific extends StructClass {
+public final class Seamap extends StructClass {
 
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         MemoryLayout.sequenceLayout(2, 
GSF.C_DOUBLE).withName("portTransmitter"),
@@ -42,7 +42,7 @@ public final class SeamapSpecific extends StructClass {
         GSF.C_DOUBLE.withName("temperature")
     ).withName("t_gsfSeamapSpecific");
 
-    public SeamapSpecific(MemorySegment struct) {
+    public Seamap(MemorySegment struct) {
         super(struct);
     }
 
diff --git 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIIISpecific.java
 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIII.java
similarity index 98%
rename from 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIIISpecific.java
rename to 
incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIII.java
index 889bdb0db7..9b8ae19853 100644
--- 
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIIISpecific.java
+++ 
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIII.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.gsf.StructClass;
  *
  * @author Johann Sorel (Geomatys)
  */
-public final class TypeIIISpecific extends StructClass {
+public final class TypeIII extends StructClass {
     public static final GroupLayout LAYOUT = MemoryLayout.structLayout(
         GSF.C_SHORT.withName("leftmost_beam"),
         GSF.C_SHORT.withName("rightmost_beam"),
@@ -37,7 +37,7 @@ public final class TypeIIISpecific extends StructClass {
         GSF.C_SHORT.withName("mission_number")
     ).withName("t_gsfTypeIIISpecific");
 
-    public TypeIIISpecific(MemorySegment struct) {
+    public TypeIII(MemorySegment struct) {
         super(struct);
     }
 

Reply via email to