diff --git a/Goslin.g4 b/Goslin.g4
index 2f182363..1b2b0116 100644
--- a/Goslin.g4
+++ b/Goslin.g4
@@ -130,7 +130,14 @@ sl_subspecies : lcb sorted_fa_separator fa;
 hg_lslc : hg_lsl | hg_lsl heavy_hg;
 hg_lsl : 'LCB' | 'LCBP' | 'LHexCer' | 'LSM' | 'LIPC' | 'So' | 'Sa' | 'SPH' | 'Sph' | 'LCB' | 'S1P' | 'SPH-P' | 'SIP' | 'Sa1P';
 hg_dslc : hg_dsl | hg_dsl heavy_hg;
-hg_dsl : 'Cer' | 'CerP' | 'EPC' | 'GB4' | 'GD3' | 'GB3' | 'GM1' | 'GM3' | 'GM4' | 'Hex3Cer' | 'Hex2Cer' | 'HexCer' | 'IPC' | 'MIP2C' | 'M(IP)2C' | 'MIPC' | 'SHexCer' | 'SM' | 'FMC-5' | 'FMC-6' | 'CerPE' | 'PE-Cer';
+hg_dsl : 'Cer' | 'CerP' | 'EPC' | 'HexCer' | 'Hex2Cer' | 'Hex3Cer' | 'IPC' | 'MIP2C' | 'M(IP)2C' | 'MIPC' | 'SHexCer' | 'SM' | 'FMC-5' | 'FMC-6' | 'CerPE' | 'PE-Cer' |
+ 'GA1' | 'Ga1' | 'GA2' | 'Ga2' |
+ 'GB3' | 'Gb3' | 'GB4' | 'Gb4' |
+ 'GD1' | 'Gd1' | 'GD2' | 'Gd2' | 'GD3' | 'Gd3' |
+ 'GM1' | 'Gm1' | 'GM2' | 'Gm2' | 'GM3' | 'Gm3' | 'GM4' | 'Gm4' |
+ 'GP1' | 'Gp1' |
+ 'GQ1' | 'Gq1' |
+ 'GT1' | 'Gt1' | 'GT2' | 'Gt2' | 'GT3' | 'Gt3';
 
 
 
diff --git a/lipid-list.csv b/lipid-list.csv
index c620ec6a..97eb33ff 100644
--- a/lipid-list.csv
+++ b/lipid-list.csv
@@ -97,8 +97,8 @@ Fuc-iGb3Cer,SP,Glycosphingolipids,2,2,,C24H41O19,,,,,,,
 Fuc(Gal)-GM1,SP,Acidic glycosphingolipids [SP06],2,2,,C49H80N2O37,,,,,,,
 Fuc(Gal)Gal-iGb4Cer,SP,Glycosphingolipids,2,2,,C44H74NO34,,,,,,,
 FucGalGb3Cer,SP,Glycosphingolipids,2,2,,C30H51O24,,,,,,,
-GA1,SP,Glycosphingolipids,2,2,,C26H44NO20,,,,,,,
-GA2,SP,Glycosphingolipids,2,2,,C20H34NO15,,,,,,,
+GA1,SP,Glycosphingolipids,2,2,,C26H44NO20,Ga1,,,,,,
+GA2,SP,Glycosphingolipids,2,2,,C20H34NO15,Ga2,,,,,,
 Gal-GD1b,SP,Globoside,2,2,,C54H86N3O41,,,,,,,
 Gal-iGb4Cer,SP,Glycosphingolipids,2,2,,C32H54NO25,,,,,,,
 Gal(Fuc)-GA1,SP,Globoside,2,2,,C38H64NO29,,,,,,,
@@ -119,17 +119,17 @@ GalNAc-GM1b(NeuGc),SP,Globoside,2,2,,C45H73N3O34,,,,,,,
 GalNAcGal(Fuc)-GA1,SP,Globoside,2,2,,C46H77N2O34,,,,,,,
 GalNAcGalGb3Cer,SP,Glycosphingolipids,2,2,,C32H54NO25,,,,,,,
 GB4,SP,Neutral glycosphingolipids [SP05],2,2,,C26H44NO20,Gb4,Tetrahexosylceramide,Gb4Cer,GB4Cer,,,
-GD1,SP,Glycosphingolipids,2,2,,C48H76N3O36,,,,,,,
-GD1a,SP,Ganglioside,2,2,,C48H76N3O36,,,,,,,
+GD1,SP,Glycosphingolipids,2,2,,C48H76N3O36,Gd1,,,,,,
+GD1a,SP,Ganglioside,2,2,,C48H76N3O36,Gd1a,,,,,,
 GD1a alpha,SP,Ganglioside,2,2,,C48H76N3O36,,,,,,,
 GD1a(NeuAc/NeuGc),SP,Ganglioside,2,2,,C48H76N3O36,,,,,,,
 GD1a(NeuGc/NeuAc),SP,Ganglioside,2,2,,C48H76N3O37,,,,,,,
 GD1a(NeuGc/NeuGc),SP,Ganglioside,2,2,,C48H76N3O38,,,,,,,
-GD1b,SP,Ganglioside,2,2,,C48H76N3O36,,,,,,,
-GD1c,SP,Ganglioside,2,2,,C48H76N3O36,,,,,,,
+GD1b,SP,Ganglioside,2,2,,C48H76N3O36,Gd1b,,,,,,
+GD1c,SP,Ganglioside,2,2,,C48H76N3O36,Gd1c,,,,,,
 GD1c(NeuGc/NeuGc),SP,Ganglioside,2,2,,C48H76N3O38,,,,,,,
-GD2,SP,Glycosphingolipids,2,2,,C42H66N3O31,,,,,,,
-GD3,SP,Glycosphingolipids,2,2,,C34H55N2O26,,,,,,,
+GD2,SP,Glycosphingolipids,2,2,,C42H66N3O31,Gd2,,,,,,
+GD3,SP,Glycosphingolipids,2,2,,C34H55N2O26,Gd3,,,,,,
 Glc-DG,GL,Glycosyldiradylglycerols [GL05],2,2,,,,,,,,,
 Glc-GP,GP,Diacylglycosylglycerophospholipids [GP1401],2,2,,C9H17O11P,,,,,,,
 GlcNAc-GalGb4Cer,SP,Glycosphingolipids,2,2,,C40H67N2O30,,,,,,,
@@ -138,32 +138,32 @@ Globo-A,SP,Glycosphingolipids,2,2,,C46H77N2O34,,,,,,,
 Globo-B,SP,Glycosphingolipids,2,2,,C44H74NO34,,,,,,,
 Globo-H,SP,Glycosphingolipids,2,2,,C38H64NO29,,,,,,,
 Globo-Lex-9,SP,Glycosphingolipids,2,2,,C52H87N2O39,,,,,,,
-GM1,SP,Glycosphingolipids,2,2,,C37H60N2O28,,,,,,,
+GM1,SP,Glycosphingolipids,2,2,,C37H60N2O28,Gm1,,,,,,
 GM1 alpha,SP,Ganglioside,2,2,,C37H60N2O28,,,,,,,
 GM1(NeuGc),SP,Ganglioside,2,2,,C37H60N2O28,,,,,,,
 GM1b,SP,Ganglioside,2,2,,C37H60N2O28,,,,,,,
 GM1b(NeuGc),SP,Ganglioside,2,2,,C37H60N2O29,,,,,,,
-GM2,SP,Glycosphingolipids,2,2,,C31H50N2O23,,,,,,,
+GM2,SP,Glycosphingolipids,2,2,,C31H50N2O23,Gm2,,,,,,
 GM2(NeuGc),SP,Ganglioside,2,2,,C31H50N2O24,,,,,,,
-GM3,SP,Glycosphingolipids,2,2,,C23H38NO18,,,,,,,
-GM4,SP,Gangliosides [SP0601],2,2,,C17H28NO13,,,,,,,
+GM3,SP,Glycosphingolipids,2,2,,C23H38NO18,Gm3,,,,,,
+GM4,SP,Gangliosides [SP0601],2,2,,C17H28NO13,Gm4,,,,,,
 GP-NAE,FA,Glycerophosphoethanolamine,1,1,,C5H13NO6P,,,,,,,
-GP1,SP,Glycosphingolipids,2,2,,C81H124N6O60,,,,,,,
+GP1,SP,Glycosphingolipids,2,2,,C81H124N6O60,Gp1,,,,,,
 GP1c,SP,Ganglioside,2,2,,C81H124N6O60,,,,,,,
 GP1c alpha,SP,Ganglioside,2,2,,C81H124N6O60,,,,,,,
-GQ1,SP,Glycosphingolipids,2,2,,C70H108N5O52,,,,,,,
+GQ1,SP,Glycosphingolipids,2,2,,C70H108N5O52,Gq1,,,,,,
 GQ1b,SP,Ganglioside,2,2,,C70H108N5O52,,,,,,,
 GQ1b alpha,SP,Ganglioside,2,2,,C70H108N5O52,,,,,,,
 GQ1c,SP,Ganglioside,2,2,,C70H108N5O52,,,,,,,
-GT1,SP,Glycosphingolipids,2,2,,C59H92N4O44,,,,,,,
+GT1,SP,Glycosphingolipids,2,2,,C59H92N4O44,Gt1,,,,,,
 GT1a,SP,Ganglioside,2,2,,C59H92N4O44,,,,,,,
 GT1a alpha,SP,Ganglioside,2,2,,C59H92N4O44,,,,,,,
 GT1b,SP,Ganglioside,2,2,,C59H92N4O44,,,,,,,
 GT1b alpha,SP,Globoside,2,2,,C59H92N4O44,,,,,,,
 GT1b alpha(NeuGc),SP,Globoside,2,2,,C59H92N4O45,,,,,,,
 GT1c,SP,Ganglioside,2,2,,C59H92N4O44,,,,,,,
-GT2,SP,Glycosphingolipids,2,2,,C53H82N4O39,,,,,,,
-GT3,SP,Glycosphingolipids,2,2,,C45H69N3O34,,,,,,,
+GT2,SP,Glycosphingolipids,2,2,,C53H82N4O39,Gt2,,,,,,
+GT3,SP,Glycosphingolipids,2,2,,C45H69N3O34,Gt3,,,,,,
 HC,FA,Hydrocarbons [FA11],1,1,HC,H,,,,,,,
 LacCer,SP,Neutral glycosphingolipids [SP05],2,2,,C12H21O10,,,,,,,
 Hex2Cer,SP,Neutral glycosphingolipids [SP05],2,2,,C12H21O10,,,,,,,