diff --git a/definitions/Makefile.am b/definitions/Makefile.am
index 53a160c1e..2e04303d7 100644
--- a/definitions/Makefile.am
+++ b/definitions/Makefile.am
@@ -10,8 +10,7 @@ dist_definitions_DATA = \
 	./param_id.table\
 	./parameters_version.def\
 	./publish_new_parameters.sh\
-	./stepUnits.table\
-	./x.grib
+	./stepUnits.table
 
 definitionsbudgdir = @ECCODES_DEFINITION_PATH@/budg
 dist_definitionsbudg_DATA = \
@@ -7435,6 +7434,14 @@ dist_definitionsbufr_tables_3_wmo_6_DATA = \
 	bufr/tables/3/wmo/6/element.table\
 	bufr/tables/3/wmo/6/sequence.def
 
+definitionsbufr_templatesdir = @ECCODES_DEFINITION_PATH@/bufr/templates
+dist_definitionsbufr_templates_DATA = \
+	bufr/templates/BufrTemplate.def
+
+definitionsbufr_templates_localdir = @ECCODES_DEFINITION_PATH@/bufr/templates/local
+dist_definitionsbufr_templates_local_DATA = \
+	bufr/templates/local/BufrTemplate.def
+
 definitionscdfdir = @ECCODES_DEFINITION_PATH@/cdf
 dist_definitionscdf_DATA = \
 	cdf/boot.def
@@ -11572,305 +11579,306 @@ dist_definitionsmars_DATA = \
 	mars/default_labeling.def\
 	mars/domain.96.table\
 	mars/domain.table\
-	mars/grib1.amap.an.def\
-	mars/grib1.dacl.pb.def\
-	mars/grib1.dacw.pb.def\
-	mars/grib1.dcda.4i.def\
-	mars/grib1.dcda.me.def\
-	mars/grib1.dcda.sim.def\
-	mars/grib1.edmm.an.def\
-	mars/grib1.edmm.cl.def\
-	mars/grib1.edmm.fc.def\
-	mars/grib1.edmm.fg.def\
-	mars/grib1.edmm.ia.def\
-	mars/grib1.edmm.ssd.def\
-	mars/grib1.edmo.an.def\
-	mars/grib1.edmo.cl.def\
-	mars/grib1.edmo.fc.def\
-	mars/grib1.edmo.ssd.def\
-	mars/grib1.efhc.cf.def\
-	mars/grib1.efhc.icp.def\
-	mars/grib1.efhc.pf.def\
-	mars/grib1.efho.cf.def\
-	mars/grib1.efho.pf.def\
-	mars/grib1.efhs.cd.def\
-	mars/grib1.efhs.ed.def\
-	mars/grib1.efhs.em.def\
-	mars/grib1.efhs.es.def\
-	mars/grib1.efhs.taem.def\
-	mars/grib1.efhs.taes.def\
-	mars/grib1.efov.pf.def\
-	mars/grib1.ehmm.em.def\
-	mars/grib1.elda.4i.def\
-	mars/grib1.elda.4v.def\
-	mars/grib1.elda.an.def\
-	mars/grib1.elda.ea.def\
-	mars/grib1.elda.ef.def\
-	mars/grib1.elda.em.def\
-	mars/grib1.elda.es.def\
-	mars/grib1.elda.fc.def\
-	mars/grib1.elda.me.def\
-	mars/grib1.elda.ses.def\
-	mars/grib1.enda.4v.def\
-	mars/grib1.enda.an.def\
-	mars/grib1.enda.def\
-	mars/grib1.enda.ea.def\
-	mars/grib1.enda.ef.def\
-	mars/grib1.enda.em.def\
-	mars/grib1.enda.es.def\
-	mars/grib1.enda.fc.def\
-	mars/grib1.enda.ssd.def\
-	mars/grib1.enda.sv.def\
-	mars/grib1.enda.svar.def\
-	mars/grib1.enfh.cf.def\
-	mars/grib1.enfh.fcmax.def\
-	mars/grib1.enfh.fcmean.def\
-	mars/grib1.enfh.fcmin.def\
-	mars/grib1.enfh.fcstdev.def\
-	mars/grib1.enfh.ff.def\
-	mars/grib1.enfh.icp.def\
-	mars/grib1.enfh.pf.def\
-	mars/grib1.enfh.tims.def\
-	mars/grib1.enfo.cf.def\
-	mars/grib1.enfo.ci.def\
-	mars/grib1.enfo.cm.def\
-	mars/grib1.enfo.cr.def\
-	mars/grib1.enfo.cs.def\
-	mars/grib1.enfo.cv.def\
-	mars/grib1.enfo.ed.def\
-	mars/grib1.enfo.ef.def\
-	mars/grib1.enfo.efi.def\
-	mars/grib1.enfo.efic.def\
-	mars/grib1.enfo.em.def\
-	mars/grib1.enfo.ep.def\
-	mars/grib1.enfo.es.def\
-	mars/grib1.enfo.fc.def\
-	mars/grib1.enfo.fcmax.def\
-	mars/grib1.enfo.fcmean.def\
-	mars/grib1.enfo.fcmin.def\
-	mars/grib1.enfo.fcstdev.def\
-	mars/grib1.enfo.ff.def\
-	mars/grib1.enfo.fp.def\
-	mars/grib1.enfo.icp.def\
-	mars/grib1.enfo.pb.def\
-	mars/grib1.enfo.pd.def\
-	mars/grib1.enfo.pf.def\
-	mars/grib1.enfo.sot.def\
-	mars/grib1.enfo.sv.def\
-	mars/grib1.enfo.svar.def\
-	mars/grib1.enfo.taem.def\
-	mars/grib1.enfo.taes.def\
-	mars/grib1.enfo.tu.def\
-	mars/grib1.enwh.cf.def\
-	mars/grib1.enwh.fcmax.def\
-	mars/grib1.enwh.fcmean.def\
-	mars/grib1.enwh.fcmin.def\
-	mars/grib1.enwh.fcstdev.def\
-	mars/grib1.enwh.pf.def\
-	mars/grib1.esmm.em.def\
-	mars/grib1.espd.an.def\
-	mars/grib1.ewda.4v.def\
-	mars/grib1.ewda.an.def\
-	mars/grib1.ewda.def\
-	mars/grib1.ewda.fc.def\
-	mars/grib1.ewhc.cf.def\
-	mars/grib1.ewhc.pf.def\
-	mars/grib1.ewho.cf.def\
-	mars/grib1.ewho.pf.def\
-	mars/grib1.ewla.4v.def\
-	mars/grib1.ewla.an.def\
-	mars/grib1.ewla.fc.def\
-	mars/grib1.ewmm.an.def\
-	mars/grib1.ewmm.cl.def\
-	mars/grib1.ewmm.fc.def\
-	mars/grib1.ewmo.an.def\
-	mars/grib1.ewmo.cl.def\
-	mars/grib1.ewmo.def\
-	mars/grib1.ewmo.fc.def\
-	mars/grib1.gfas.ga.def\
-	mars/grib1.gfas.gsd.def\
-	mars/grib1.kwbc.pf.def\
-	mars/grib1.lwda.4i.def\
-	mars/grib1.lwda.4v.def\
-	mars/grib1.lwda.an.def\
-	mars/grib1.lwda.ea.def\
-	mars/grib1.lwda.ef.def\
-	mars/grib1.lwda.fc.def\
-	mars/grib1.lwda.me.def\
-	mars/grib1.lwwv.4v.def\
-	mars/grib1.lwwv.an.def\
-	mars/grib1.lwwv.fc.def\
-	mars/grib1.maed.an.def\
-	mars/grib1.maed.fc.def\
-	mars/grib1.mawv.fc.def\
-	mars/grib1.mdfa.fc.def\
-	mars/grib1.me.def\
-	mars/grib1.mfam.em.def\
-	mars/grib1.mfam.fcmean.def\
-	mars/grib1.mfam.fp.def\
-	mars/grib1.mfam.pb.def\
-	mars/grib1.mfam.pd.def\
-	mars/grib1.mfhm.em.def\
-	mars/grib1.mfhm.es.def\
-	mars/grib1.mfhm.fcmax.def\
-	mars/grib1.mfhm.fcmean.def\
-	mars/grib1.mfhm.fcmin.def\
-	mars/grib1.mfhm.fcstdev.def\
-	mars/grib1.mfhw.cf.def\
-	mars/grib1.mfhw.fc.def\
-	mars/grib1.mfwm.fcmax.def\
-	mars/grib1.mfwm.fcmean.def\
-	mars/grib1.mfwm.fcmin.def\
-	mars/grib1.mfwm.fcstdev.def\
-	mars/grib1.mhwm.fcmax.def\
-	mars/grib1.mhwm.fcmean.def\
-	mars/grib1.mhwm.fcmin.def\
-	mars/grib1.mhwm.fcstdev.def\
-	mars/grib1.mmaf.fc.def\
-	mars/grib1.mmaf.fcmean.def\
-	mars/grib1.mmam.fcmean.def\
-	mars/grib1.mmsa.em.def\
-	mars/grib1.mmsa.fcmean.def\
-	mars/grib1.mmsf.fc.def\
-	mars/grib1.mmsf.icp.def\
-	mars/grib1.mnfc.cf.def\
-	mars/grib1.mnfc.ed.def\
-	mars/grib1.mnfc.em.def\
-	mars/grib1.mnfc.es.def\
-	mars/grib1.mnfc.fc.def\
-	mars/grib1.mnfc.ff.def\
-	mars/grib1.mnfc.icp.def\
-	mars/grib1.mnfc.of.def\
-	mars/grib1.mnfh.cf.def\
-	mars/grib1.mnfh.ed.def\
-	mars/grib1.mnfh.em.def\
-	mars/grib1.mnfh.es.def\
-	mars/grib1.mnfh.fc.def\
-	mars/grib1.mnfh.icp.def\
-	mars/grib1.mnfm.em.def\
-	mars/grib1.mnfm.es.def\
-	mars/grib1.mnfm.fcmax.def\
-	mars/grib1.mnfm.fcmean.def\
-	mars/grib1.mnfm.fcmin.def\
-	mars/grib1.mnfm.fcstdev.def\
-	mars/grib1.mnfw.cf.def\
-	mars/grib1.mnfw.fc.def\
-	mars/grib1.mnth.an.def\
-	mars/grib1.mnth.cl.def\
-	mars/grib1.mnth.fc.def\
-	mars/grib1.mnth.fg.def\
-	mars/grib1.mnth.ia.def\
-	mars/grib1.mnth.ssd.def\
-	mars/grib1.moda.an.def\
-	mars/grib1.moda.cl.def\
-	mars/grib1.moda.fc.def\
-	mars/grib1.moda.ssd.def\
-	mars/grib1.mofc.cf.def\
-	mars/grib1.mofc.ed.def\
-	mars/grib1.mofc.em.def\
-	mars/grib1.mofc.es.def\
-	mars/grib1.mofc.fc.def\
-	mars/grib1.mofc.ff.def\
-	mars/grib1.mofc.of.def\
-	mars/grib1.mofm.fcmax.def\
-	mars/grib1.mofm.fcmean.def\
-	mars/grib1.mofm.fcmin.def\
-	mars/grib1.mofm.fcstdev.def\
-	mars/grib1.mpic.s3.def\
-	mars/grib1.msda.an.def\
-	mars/grib1.msdc.an.def\
-	mars/grib1.msdc.fc.def\
-	mars/grib1.msmm.em.def\
-	mars/grib1.msmm.fcmax.def\
-	mars/grib1.msmm.fcmean.def\
-	mars/grib1.msmm.fcmin.def\
-	mars/grib1.msmm.fcstdev.def\
-	mars/grib1.msmm.hcmean.def\
-	mars/grib1.ocea.an.def\
-	mars/grib1.ocea.ff.def\
-	mars/grib1.ocea.fx.def\
-	mars/grib1.ocea.of.def\
-	mars/grib1.ocea.or.def\
-	mars/grib1.oper.3v.def\
-	mars/grib1.oper.4i.def\
-	mars/grib1.oper.4v.def\
-	mars/grib1.oper.an.def\
-	mars/grib1.oper.ea.def\
-	mars/grib1.oper.ef.def\
-	mars/grib1.oper.fa.def\
-	mars/grib1.oper.fc.def\
-	mars/grib1.oper.fg.def\
-	mars/grib1.oper.go.def\
-	mars/grib1.oper.ia.def\
-	mars/grib1.oper.im.def\
-	mars/grib1.oper.me.def\
-	mars/grib1.oper.oi.def\
-	mars/grib1.oper.si.def\
-	mars/grib1.oper.sim.def\
-	mars/grib1.oper.ssd.def\
-	mars/grib1.scda.4i.def\
-	mars/grib1.scda.me.def\
-	mars/grib1.seap.an.def\
-	mars/grib1.seap.ef.def\
-	mars/grib1.seap.es.def\
-	mars/grib1.seap.fc.def\
-	mars/grib1.seap.sv.def\
-	mars/grib1.seap.svar.def\
-	mars/grib1.seas.an.def\
-	mars/grib1.seas.fc.def\
-	mars/grib1.seas.ff.def\
-	mars/grib1.seas.fx.def\
-	mars/grib1.seas.of.def\
-	mars/grib1.seas.or.def\
-	mars/grib1.sens.me.def\
-	mars/grib1.sens.sf.def\
-	mars/grib1.sens.sg.def\
-	mars/grib1.sfmm.em.def\
-	mars/grib1.sfmm.fcmax.def\
-	mars/grib1.sfmm.fcmean.def\
-	mars/grib1.sfmm.fcmin.def\
-	mars/grib1.sfmm.fcstdev.def\
-	mars/grib1.smma.em.def\
-	mars/grib1.smma.fcmean.def\
-	mars/grib1.supd.an.def\
-	mars/grib1.swmm.fcmax.def\
-	mars/grib1.swmm.fcmean.def\
-	mars/grib1.swmm.fcmin.def\
-	mars/grib1.swmm.fcstdev.def\
-	mars/grib1.ukmo.s3.def\
-	mars/grib1.waef.cv.def\
-	mars/grib1.waef.efi.def\
-	mars/grib1.waef.efic.def\
-	mars/grib1.waef.ep.def\
-	mars/grib1.waef.fcmax.def\
-	mars/grib1.waef.fcmean.def\
-	mars/grib1.waef.fcmin.def\
-	mars/grib1.waef.fcstdev.def\
-	mars/grib1.waef.fp.def\
-	mars/grib1.waef.pf.def\
-	mars/grib1.waef.sot.def\
-	mars/grib1.wamd.an.def\
-	mars/grib1.wamd.fc.def\
-	mars/grib1.wamf.cf.def\
-	mars/grib1.wamf.fc.def\
-	mars/grib1.wamo.an.def\
-	mars/grib1.wamo.cl.def\
-	mars/grib1.wamo.fc.def\
-	mars/grib1.wasf.fc.def\
-	mars/grib1.wave.4v.def\
-	mars/grib1.wave.an.def\
-	mars/grib1.wave.def\
-	mars/grib1.wave.fc.def\
-	mars/grib1.wave.fg.def\
-	mars/grib1.wehs.cd.def\
-	mars/grib1.wehs.ed.def\
-	mars/grib1.wehs.em.def\
-	mars/grib1.wehs.es.def\
-	mars/grib1.weov.pf.def\
-	mars/grib1.wmfm.fcmax.def\
-	mars/grib1.wmfm.fcmean.def\
-	mars/grib1.wmfm.fcmin.def\
-	mars/grib1.wmfm.fcstdev.def\
+	mars/grib.amap.an.def\
+	mars/grib.dacl.pb.def\
+	mars/grib.dacw.pb.def\
+	mars/grib.dcda.4i.def\
+	mars/grib.dcda.me.def\
+	mars/grib.dcda.sim.def\
+	mars/grib.edmm.an.def\
+	mars/grib.edmm.cl.def\
+	mars/grib.edmm.fc.def\
+	mars/grib.edmm.fg.def\
+	mars/grib.edmm.ia.def\
+	mars/grib.edmm.ssd.def\
+	mars/grib.edmo.an.def\
+	mars/grib.edmo.cl.def\
+	mars/grib.edmo.fc.def\
+	mars/grib.edmo.ssd.def\
+	mars/grib.efhc.cf.def\
+	mars/grib.efhc.icp.def\
+	mars/grib.efhc.pf.def\
+	mars/grib.efho.cf.def\
+	mars/grib.efho.pf.def\
+	mars/grib.efhs.cd.def\
+	mars/grib.efhs.ed.def\
+	mars/grib.efhs.em.def\
+	mars/grib.efhs.es.def\
+	mars/grib.efhs.taem.def\
+	mars/grib.efhs.taes.def\
+	mars/grib.efov.pf.def\
+	mars/grib.ehmm.em.def\
+	mars/grib.elda.4i.def\
+	mars/grib.elda.4v.def\
+	mars/grib.elda.an.def\
+	mars/grib.elda.ea.def\
+	mars/grib.elda.ef.def\
+	mars/grib.elda.em.def\
+	mars/grib.elda.es.def\
+	mars/grib.elda.fc.def\
+	mars/grib.elda.me.def\
+	mars/grib.elda.ses.def\
+	mars/grib.enda.4v.def\
+	mars/grib.enda.an.def\
+	mars/grib.enda.def\
+	mars/grib.enda.ea.def\
+	mars/grib.enda.ef.def\
+	mars/grib.enda.em.def\
+	mars/grib.enda.es.def\
+	mars/grib.enda.fc.def\
+	mars/grib.enda.ssd.def\
+	mars/grib.enda.sv.def\
+	mars/grib.enda.svar.def\
+	mars/grib.enfh.cf.def\
+	mars/grib.enfh.fcmax.def\
+	mars/grib.enfh.fcmean.def\
+	mars/grib.enfh.fcmin.def\
+	mars/grib.enfh.fcstdev.def\
+	mars/grib.enfh.ff.def\
+	mars/grib.enfh.icp.def\
+	mars/grib.enfh.pf.def\
+	mars/grib.enfh.tims.def\
+	mars/grib.enfo.cf.def\
+	mars/grib.enfo.ci.def\
+	mars/grib.enfo.cm.def\
+	mars/grib.enfo.cr.def\
+	mars/grib.enfo.cs.def\
+	mars/grib.enfo.cv.def\
+	mars/grib.enfo.ed.def\
+	mars/grib.enfo.ef.def\
+	mars/grib.enfo.efi.def\
+	mars/grib.enfo.efic.def\
+	mars/grib.enfo.em.def\
+	mars/grib.enfo.ep.def\
+	mars/grib.enfo.es.def\
+	mars/grib.enfo.fc.def\
+	mars/grib.enfo.fcmax.def\
+	mars/grib.enfo.fcmean.def\
+	mars/grib.enfo.fcmin.def\
+	mars/grib.enfo.fcstdev.def\
+	mars/grib.enfo.ff.def\
+	mars/grib.enfo.fp.def\
+	mars/grib.enfo.icp.def\
+	mars/grib.enfo.pb.def\
+	mars/grib.enfo.pd.def\
+	mars/grib.enfo.pf.def\
+	mars/grib.enfo.sot.def\
+	mars/grib.enfo.sv.def\
+	mars/grib.enfo.svar.def\
+	mars/grib.enfo.taem.def\
+	mars/grib.enfo.taes.def\
+	mars/grib.enfo.tu.def\
+	mars/grib.enwh.cf.def\
+	mars/grib.enwh.fcmax.def\
+	mars/grib.enwh.fcmean.def\
+	mars/grib.enwh.fcmin.def\
+	mars/grib.enwh.fcstdev.def\
+	mars/grib.enwh.pf.def\
+	mars/grib.esmm.em.def\
+	mars/grib.espd.an.def\
+	mars/grib.ewda.4v.def\
+	mars/grib.ewda.an.def\
+	mars/grib.ewda.def\
+	mars/grib.ewda.fc.def\
+	mars/grib.ewhc.cf.def\
+	mars/grib.ewhc.pf.def\
+	mars/grib.ewho.cf.def\
+	mars/grib.ewho.pf.def\
+	mars/grib.ewla.4v.def\
+	mars/grib.ewla.an.def\
+	mars/grib.ewla.fc.def\
+	mars/grib.ewmm.an.def\
+	mars/grib.ewmm.cl.def\
+	mars/grib.ewmm.fc.def\
+	mars/grib.ewmo.an.def\
+	mars/grib.ewmo.cl.def\
+	mars/grib.ewmo.def\
+	mars/grib.ewmo.fc.def\
+	mars/grib.gfas.ga.def\
+	mars/grib.gfas.gsd.def\
+	mars/grib.kwbc.pf.def\
+	mars/grib.lwda.4i.def\
+	mars/grib.lwda.4v.def\
+	mars/grib.lwda.an.def\
+	mars/grib.lwda.ea.def\
+	mars/grib.lwda.ef.def\
+	mars/grib.lwda.fc.def\
+	mars/grib.lwda.me.def\
+	mars/grib.lwda.ssd.def\
+	mars/grib.lwwv.4v.def\
+	mars/grib.lwwv.an.def\
+	mars/grib.lwwv.fc.def\
+	mars/grib.maed.an.def\
+	mars/grib.maed.fc.def\
+	mars/grib.mawv.fc.def\
+	mars/grib.mdfa.fc.def\
+	mars/grib.me.def\
+	mars/grib.mfam.em.def\
+	mars/grib.mfam.fcmean.def\
+	mars/grib.mfam.fp.def\
+	mars/grib.mfam.pb.def\
+	mars/grib.mfam.pd.def\
+	mars/grib.mfhm.em.def\
+	mars/grib.mfhm.es.def\
+	mars/grib.mfhm.fcmax.def\
+	mars/grib.mfhm.fcmean.def\
+	mars/grib.mfhm.fcmin.def\
+	mars/grib.mfhm.fcstdev.def\
+	mars/grib.mfhw.cf.def\
+	mars/grib.mfhw.fc.def\
+	mars/grib.mfwm.fcmax.def\
+	mars/grib.mfwm.fcmean.def\
+	mars/grib.mfwm.fcmin.def\
+	mars/grib.mfwm.fcstdev.def\
+	mars/grib.mhwm.fcmax.def\
+	mars/grib.mhwm.fcmean.def\
+	mars/grib.mhwm.fcmin.def\
+	mars/grib.mhwm.fcstdev.def\
+	mars/grib.mmaf.fc.def\
+	mars/grib.mmaf.fcmean.def\
+	mars/grib.mmam.fcmean.def\
+	mars/grib.mmsa.em.def\
+	mars/grib.mmsa.fcmean.def\
+	mars/grib.mmsf.fc.def\
+	mars/grib.mmsf.icp.def\
+	mars/grib.mnfc.cf.def\
+	mars/grib.mnfc.ed.def\
+	mars/grib.mnfc.em.def\
+	mars/grib.mnfc.es.def\
+	mars/grib.mnfc.fc.def\
+	mars/grib.mnfc.ff.def\
+	mars/grib.mnfc.icp.def\
+	mars/grib.mnfc.of.def\
+	mars/grib.mnfh.cf.def\
+	mars/grib.mnfh.ed.def\
+	mars/grib.mnfh.em.def\
+	mars/grib.mnfh.es.def\
+	mars/grib.mnfh.fc.def\
+	mars/grib.mnfh.icp.def\
+	mars/grib.mnfm.em.def\
+	mars/grib.mnfm.es.def\
+	mars/grib.mnfm.fcmax.def\
+	mars/grib.mnfm.fcmean.def\
+	mars/grib.mnfm.fcmin.def\
+	mars/grib.mnfm.fcstdev.def\
+	mars/grib.mnfw.cf.def\
+	mars/grib.mnfw.fc.def\
+	mars/grib.mnth.an.def\
+	mars/grib.mnth.cl.def\
+	mars/grib.mnth.fc.def\
+	mars/grib.mnth.fg.def\
+	mars/grib.mnth.ia.def\
+	mars/grib.mnth.ssd.def\
+	mars/grib.moda.an.def\
+	mars/grib.moda.cl.def\
+	mars/grib.moda.fc.def\
+	mars/grib.moda.ssd.def\
+	mars/grib.mofc.cf.def\
+	mars/grib.mofc.ed.def\
+	mars/grib.mofc.em.def\
+	mars/grib.mofc.es.def\
+	mars/grib.mofc.fc.def\
+	mars/grib.mofc.ff.def\
+	mars/grib.mofc.of.def\
+	mars/grib.mofm.fcmax.def\
+	mars/grib.mofm.fcmean.def\
+	mars/grib.mofm.fcmin.def\
+	mars/grib.mofm.fcstdev.def\
+	mars/grib.mpic.s3.def\
+	mars/grib.msda.an.def\
+	mars/grib.msdc.an.def\
+	mars/grib.msdc.fc.def\
+	mars/grib.msmm.em.def\
+	mars/grib.msmm.fcmax.def\
+	mars/grib.msmm.fcmean.def\
+	mars/grib.msmm.fcmin.def\
+	mars/grib.msmm.fcstdev.def\
+	mars/grib.msmm.hcmean.def\
+	mars/grib.ocea.an.def\
+	mars/grib.ocea.ff.def\
+	mars/grib.ocea.fx.def\
+	mars/grib.ocea.of.def\
+	mars/grib.ocea.or.def\
+	mars/grib.oper.3v.def\
+	mars/grib.oper.4i.def\
+	mars/grib.oper.4v.def\
+	mars/grib.oper.an.def\
+	mars/grib.oper.ea.def\
+	mars/grib.oper.ef.def\
+	mars/grib.oper.fa.def\
+	mars/grib.oper.fc.def\
+	mars/grib.oper.fg.def\
+	mars/grib.oper.go.def\
+	mars/grib.oper.ia.def\
+	mars/grib.oper.im.def\
+	mars/grib.oper.me.def\
+	mars/grib.oper.oi.def\
+	mars/grib.oper.si.def\
+	mars/grib.oper.sim.def\
+	mars/grib.oper.ssd.def\
+	mars/grib.scda.4i.def\
+	mars/grib.scda.me.def\
+	mars/grib.seap.an.def\
+	mars/grib.seap.ef.def\
+	mars/grib.seap.es.def\
+	mars/grib.seap.fc.def\
+	mars/grib.seap.sv.def\
+	mars/grib.seap.svar.def\
+	mars/grib.seas.an.def\
+	mars/grib.seas.fc.def\
+	mars/grib.seas.ff.def\
+	mars/grib.seas.fx.def\
+	mars/grib.seas.of.def\
+	mars/grib.seas.or.def\
+	mars/grib.sens.me.def\
+	mars/grib.sens.sf.def\
+	mars/grib.sens.sg.def\
+	mars/grib.sfmm.em.def\
+	mars/grib.sfmm.fcmax.def\
+	mars/grib.sfmm.fcmean.def\
+	mars/grib.sfmm.fcmin.def\
+	mars/grib.sfmm.fcstdev.def\
+	mars/grib.smma.em.def\
+	mars/grib.smma.fcmean.def\
+	mars/grib.supd.an.def\
+	mars/grib.swmm.fcmax.def\
+	mars/grib.swmm.fcmean.def\
+	mars/grib.swmm.fcmin.def\
+	mars/grib.swmm.fcstdev.def\
+	mars/grib.ukmo.s3.def\
+	mars/grib.waef.cv.def\
+	mars/grib.waef.efi.def\
+	mars/grib.waef.efic.def\
+	mars/grib.waef.ep.def\
+	mars/grib.waef.fcmax.def\
+	mars/grib.waef.fcmean.def\
+	mars/grib.waef.fcmin.def\
+	mars/grib.waef.fcstdev.def\
+	mars/grib.waef.fp.def\
+	mars/grib.waef.pf.def\
+	mars/grib.waef.sot.def\
+	mars/grib.wamd.an.def\
+	mars/grib.wamd.fc.def\
+	mars/grib.wamf.cf.def\
+	mars/grib.wamf.fc.def\
+	mars/grib.wamo.an.def\
+	mars/grib.wamo.cl.def\
+	mars/grib.wamo.fc.def\
+	mars/grib.wasf.fc.def\
+	mars/grib.wave.4v.def\
+	mars/grib.wave.an.def\
+	mars/grib.wave.def\
+	mars/grib.wave.fc.def\
+	mars/grib.wave.fg.def\
+	mars/grib.wehs.cd.def\
+	mars/grib.wehs.ed.def\
+	mars/grib.wehs.em.def\
+	mars/grib.wehs.es.def\
+	mars/grib.weov.pf.def\
+	mars/grib.wmfm.fcmax.def\
+	mars/grib.wmfm.fcmean.def\
+	mars/grib.wmfm.fcmin.def\
+	mars/grib.wmfm.fcstdev.def\
 	mars/make_type_switch_case.sh\
 	mars/marsTypeConcept.def\
 	mars/model.96.table\
@@ -11882,21 +11890,21 @@ definitionsmars_eswidir = @ECCODES_DEFINITION_PATH@/mars/eswi
 dist_definitionsmars_eswi_DATA = \
 	mars/eswi/aerosolPackingConcept.def\
 	mars/eswi/class.table\
-	mars/eswi/grib1.expr.3v.def\
-	mars/eswi/grib1.expr.4v.def\
-	mars/eswi/grib1.expr.an.def\
-	mars/eswi/grib1.expr.fc.def\
-	mars/eswi/grib1.expr.si.def\
-	mars/eswi/grib1.mdfa.fc.def\
-	mars/eswi/grib1.mnth.an.def\
-	mars/eswi/grib1.mnth.fc.def\
-	mars/eswi/grib1.moda.an.def\
-	mars/eswi/grib1.moda.fc.def\
-	mars/eswi/grib1.oper.3v.def\
-	mars/eswi/grib1.oper.4v.def\
-	mars/eswi/grib1.oper.an.def\
-	mars/eswi/grib1.oper.fc.def\
-	mars/eswi/grib1.oper.si.def\
+	mars/eswi/grib.expr.3v.def\
+	mars/eswi/grib.expr.4v.def\
+	mars/eswi/grib.expr.an.def\
+	mars/eswi/grib.expr.fc.def\
+	mars/eswi/grib.expr.si.def\
+	mars/eswi/grib.mdfa.fc.def\
+	mars/eswi/grib.mnth.an.def\
+	mars/eswi/grib.mnth.fc.def\
+	mars/eswi/grib.moda.an.def\
+	mars/eswi/grib.moda.fc.def\
+	mars/eswi/grib.oper.3v.def\
+	mars/eswi/grib.oper.4v.def\
+	mars/eswi/grib.oper.an.def\
+	mars/eswi/grib.oper.fc.def\
+	mars/eswi/grib.oper.si.def\
 	mars/eswi/model.table\
 	mars/eswi/stream.table\
 	mars/eswi/type.table\
diff --git a/definitions/grib1/section.1.def b/definitions/grib1/section.1.def
index 90385d9a3..626471e11 100644
--- a/definitions/grib1/section.1.def
+++ b/definitions/grib1/section.1.def
@@ -262,8 +262,8 @@ if(((section1Length > 40) or new() or setLocalDefinition> 0) and deleteLocalDefi
       }
     }
 
-	template_nofail marsKeywords "mars/grib1.[stream:s].[type:s].def";
-	#template marsKeywords "mars/grib1.[stream:s].[type:s].def";
+	template_nofail marsKeywords "mars/grib.[stream:s].[type:s].def";
+	#template marsKeywords "mars/grib.[stream:s].[type:s].def";
 
   }
   else
diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def
index 4f341cc43..088c3a41e 100644
--- a/definitions/grib2/section.4.def
+++ b/definitions/grib2/section.4.def
@@ -39,7 +39,7 @@ transient genVertHeightCoords = 0;
 template productDefinition "grib2/template.4.[productDefinitionTemplateNumber:l].def" ;
 
 if (defined(marsStream) && defined(marsType)) {
-   template_nofail marsKeywords1 "mars/grib1.[marsStream:s].[marsType:s].def";
+   template_nofail marsKeywords1 "mars/grib.[marsStream:s].[marsType:s].def";
 }
 
 template parameters "grib2/parameters.def";
diff --git a/definitions/mars/eswi/grib1.expr.3v.def b/definitions/mars/eswi/grib.expr.3v.def
similarity index 100%
rename from definitions/mars/eswi/grib1.expr.3v.def
rename to definitions/mars/eswi/grib.expr.3v.def
diff --git a/definitions/mars/eswi/grib1.expr.4v.def b/definitions/mars/eswi/grib.expr.4v.def
similarity index 100%
rename from definitions/mars/eswi/grib1.expr.4v.def
rename to definitions/mars/eswi/grib.expr.4v.def
diff --git a/definitions/mars/eswi/grib1.expr.an.def b/definitions/mars/eswi/grib.expr.an.def
similarity index 100%
rename from definitions/mars/eswi/grib1.expr.an.def
rename to definitions/mars/eswi/grib.expr.an.def
diff --git a/definitions/mars/eswi/grib1.expr.fc.def b/definitions/mars/eswi/grib.expr.fc.def
similarity index 100%
rename from definitions/mars/eswi/grib1.expr.fc.def
rename to definitions/mars/eswi/grib.expr.fc.def
diff --git a/definitions/mars/eswi/grib1.expr.si.def b/definitions/mars/eswi/grib.expr.si.def
similarity index 100%
rename from definitions/mars/eswi/grib1.expr.si.def
rename to definitions/mars/eswi/grib.expr.si.def
diff --git a/definitions/mars/eswi/grib1.mdfa.fc.def b/definitions/mars/eswi/grib.mdfa.fc.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.mdfa.fc.def
rename to definitions/mars/eswi/grib.mdfa.fc.def
diff --git a/definitions/mars/eswi/grib1.mnth.an.def b/definitions/mars/eswi/grib.mnth.an.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.mnth.an.def
rename to definitions/mars/eswi/grib.mnth.an.def
diff --git a/definitions/mars/eswi/grib1.mnth.fc.def b/definitions/mars/eswi/grib.mnth.fc.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.mnth.fc.def
rename to definitions/mars/eswi/grib.mnth.fc.def
diff --git a/definitions/mars/eswi/grib1.moda.an.def b/definitions/mars/eswi/grib.moda.an.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.moda.an.def
rename to definitions/mars/eswi/grib.moda.an.def
diff --git a/definitions/mars/eswi/grib1.moda.fc.def b/definitions/mars/eswi/grib.moda.fc.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.moda.fc.def
rename to definitions/mars/eswi/grib.moda.fc.def
diff --git a/definitions/mars/eswi/grib1.oper.3v.def b/definitions/mars/eswi/grib.oper.3v.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.oper.3v.def
rename to definitions/mars/eswi/grib.oper.3v.def
diff --git a/definitions/mars/eswi/grib1.oper.4v.def b/definitions/mars/eswi/grib.oper.4v.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.oper.4v.def
rename to definitions/mars/eswi/grib.oper.4v.def
diff --git a/definitions/mars/eswi/grib1.oper.an.def b/definitions/mars/eswi/grib.oper.an.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.oper.an.def
rename to definitions/mars/eswi/grib.oper.an.def
diff --git a/definitions/mars/eswi/grib1.oper.fc.def b/definitions/mars/eswi/grib.oper.fc.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.oper.fc.def
rename to definitions/mars/eswi/grib.oper.fc.def
diff --git a/definitions/mars/eswi/grib1.oper.si.def b/definitions/mars/eswi/grib.oper.si.def
old mode 100755
new mode 100644
similarity index 100%
rename from definitions/mars/eswi/grib1.oper.si.def
rename to definitions/mars/eswi/grib.oper.si.def
diff --git a/definitions/mars/grib1.amap.an.def b/definitions/mars/grib.amap.an.def
similarity index 100%
rename from definitions/mars/grib1.amap.an.def
rename to definitions/mars/grib.amap.an.def
diff --git a/definitions/mars/grib1.dacl.pb.def b/definitions/mars/grib.dacl.pb.def
similarity index 100%
rename from definitions/mars/grib1.dacl.pb.def
rename to definitions/mars/grib.dacl.pb.def
diff --git a/definitions/mars/grib1.dacw.pb.def b/definitions/mars/grib.dacw.pb.def
similarity index 100%
rename from definitions/mars/grib1.dacw.pb.def
rename to definitions/mars/grib.dacw.pb.def
diff --git a/definitions/mars/grib1.dcda.4i.def b/definitions/mars/grib.dcda.4i.def
similarity index 100%
rename from definitions/mars/grib1.dcda.4i.def
rename to definitions/mars/grib.dcda.4i.def
diff --git a/definitions/mars/grib.dcda.me.def b/definitions/mars/grib.dcda.me.def
new file mode 120000
index 000000000..3def55f94
--- /dev/null
+++ b/definitions/mars/grib.dcda.me.def
@@ -0,0 +1 @@
+grib.me.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.dcda.sim.def b/definitions/mars/grib.dcda.sim.def
similarity index 100%
rename from definitions/mars/grib1.dcda.sim.def
rename to definitions/mars/grib.dcda.sim.def
diff --git a/definitions/mars/grib1.edmm.an.def b/definitions/mars/grib.edmm.an.def
similarity index 100%
rename from definitions/mars/grib1.edmm.an.def
rename to definitions/mars/grib.edmm.an.def
diff --git a/definitions/mars/grib1.edmm.cl.def b/definitions/mars/grib.edmm.cl.def
similarity index 100%
rename from definitions/mars/grib1.edmm.cl.def
rename to definitions/mars/grib.edmm.cl.def
diff --git a/definitions/mars/grib1.edmm.fc.def b/definitions/mars/grib.edmm.fc.def
similarity index 100%
rename from definitions/mars/grib1.edmm.fc.def
rename to definitions/mars/grib.edmm.fc.def
diff --git a/definitions/mars/grib1.edmm.fg.def b/definitions/mars/grib.edmm.fg.def
similarity index 100%
rename from definitions/mars/grib1.edmm.fg.def
rename to definitions/mars/grib.edmm.fg.def
diff --git a/definitions/mars/grib1.edmm.ia.def b/definitions/mars/grib.edmm.ia.def
similarity index 100%
rename from definitions/mars/grib1.edmm.ia.def
rename to definitions/mars/grib.edmm.ia.def
diff --git a/definitions/mars/grib1.edmm.ssd.def b/definitions/mars/grib.edmm.ssd.def
similarity index 100%
rename from definitions/mars/grib1.edmm.ssd.def
rename to definitions/mars/grib.edmm.ssd.def
diff --git a/definitions/mars/grib1.edmo.an.def b/definitions/mars/grib.edmo.an.def
similarity index 100%
rename from definitions/mars/grib1.edmo.an.def
rename to definitions/mars/grib.edmo.an.def
diff --git a/definitions/mars/grib1.edmo.cl.def b/definitions/mars/grib.edmo.cl.def
similarity index 100%
rename from definitions/mars/grib1.edmo.cl.def
rename to definitions/mars/grib.edmo.cl.def
diff --git a/definitions/mars/grib1.edmo.fc.def b/definitions/mars/grib.edmo.fc.def
similarity index 100%
rename from definitions/mars/grib1.edmo.fc.def
rename to definitions/mars/grib.edmo.fc.def
diff --git a/definitions/mars/grib1.edmo.ssd.def b/definitions/mars/grib.edmo.ssd.def
similarity index 100%
rename from definitions/mars/grib1.edmo.ssd.def
rename to definitions/mars/grib.edmo.ssd.def
diff --git a/definitions/mars/grib1.efhc.cf.def b/definitions/mars/grib.efhc.cf.def
similarity index 100%
rename from definitions/mars/grib1.efhc.cf.def
rename to definitions/mars/grib.efhc.cf.def
diff --git a/definitions/mars/grib1.efhc.icp.def b/definitions/mars/grib.efhc.icp.def
similarity index 100%
rename from definitions/mars/grib1.efhc.icp.def
rename to definitions/mars/grib.efhc.icp.def
diff --git a/definitions/mars/grib1.efhc.pf.def b/definitions/mars/grib.efhc.pf.def
similarity index 100%
rename from definitions/mars/grib1.efhc.pf.def
rename to definitions/mars/grib.efhc.pf.def
diff --git a/definitions/mars/grib1.efho.cf.def b/definitions/mars/grib.efho.cf.def
similarity index 100%
rename from definitions/mars/grib1.efho.cf.def
rename to definitions/mars/grib.efho.cf.def
diff --git a/definitions/mars/grib1.efho.pf.def b/definitions/mars/grib.efho.pf.def
similarity index 100%
rename from definitions/mars/grib1.efho.pf.def
rename to definitions/mars/grib.efho.pf.def
diff --git a/definitions/mars/grib1.efhs.cd.def b/definitions/mars/grib.efhs.cd.def
similarity index 100%
rename from definitions/mars/grib1.efhs.cd.def
rename to definitions/mars/grib.efhs.cd.def
diff --git a/definitions/mars/grib1.efhs.ed.def b/definitions/mars/grib.efhs.ed.def
similarity index 100%
rename from definitions/mars/grib1.efhs.ed.def
rename to definitions/mars/grib.efhs.ed.def
diff --git a/definitions/mars/grib1.efhs.em.def b/definitions/mars/grib.efhs.em.def
similarity index 100%
rename from definitions/mars/grib1.efhs.em.def
rename to definitions/mars/grib.efhs.em.def
diff --git a/definitions/mars/grib1.efhs.es.def b/definitions/mars/grib.efhs.es.def
similarity index 100%
rename from definitions/mars/grib1.efhs.es.def
rename to definitions/mars/grib.efhs.es.def
diff --git a/definitions/mars/grib1.efhs.taem.def b/definitions/mars/grib.efhs.taem.def
similarity index 100%
rename from definitions/mars/grib1.efhs.taem.def
rename to definitions/mars/grib.efhs.taem.def
diff --git a/definitions/mars/grib1.efhs.taes.def b/definitions/mars/grib.efhs.taes.def
similarity index 100%
rename from definitions/mars/grib1.efhs.taes.def
rename to definitions/mars/grib.efhs.taes.def
diff --git a/definitions/mars/grib1.efov.pf.def b/definitions/mars/grib.efov.pf.def
similarity index 100%
rename from definitions/mars/grib1.efov.pf.def
rename to definitions/mars/grib.efov.pf.def
diff --git a/definitions/mars/grib1.ehmm.em.def b/definitions/mars/grib.ehmm.em.def
similarity index 100%
rename from definitions/mars/grib1.ehmm.em.def
rename to definitions/mars/grib.ehmm.em.def
diff --git a/definitions/mars/grib1.elda.4i.def b/definitions/mars/grib.elda.4i.def
similarity index 100%
rename from definitions/mars/grib1.elda.4i.def
rename to definitions/mars/grib.elda.4i.def
diff --git a/definitions/mars/grib1.elda.4v.def b/definitions/mars/grib.elda.4v.def
similarity index 100%
rename from definitions/mars/grib1.elda.4v.def
rename to definitions/mars/grib.elda.4v.def
diff --git a/definitions/mars/grib1.elda.an.def b/definitions/mars/grib.elda.an.def
similarity index 100%
rename from definitions/mars/grib1.elda.an.def
rename to definitions/mars/grib.elda.an.def
diff --git a/definitions/mars/grib1.elda.ea.def b/definitions/mars/grib.elda.ea.def
similarity index 100%
rename from definitions/mars/grib1.elda.ea.def
rename to definitions/mars/grib.elda.ea.def
diff --git a/definitions/mars/grib1.elda.ef.def b/definitions/mars/grib.elda.ef.def
similarity index 100%
rename from definitions/mars/grib1.elda.ef.def
rename to definitions/mars/grib.elda.ef.def
diff --git a/definitions/mars/grib1.elda.em.def b/definitions/mars/grib.elda.em.def
similarity index 100%
rename from definitions/mars/grib1.elda.em.def
rename to definitions/mars/grib.elda.em.def
diff --git a/definitions/mars/grib1.elda.es.def b/definitions/mars/grib.elda.es.def
similarity index 100%
rename from definitions/mars/grib1.elda.es.def
rename to definitions/mars/grib.elda.es.def
diff --git a/definitions/mars/grib1.elda.fc.def b/definitions/mars/grib.elda.fc.def
similarity index 100%
rename from definitions/mars/grib1.elda.fc.def
rename to definitions/mars/grib.elda.fc.def
diff --git a/definitions/mars/grib1.elda.me.def b/definitions/mars/grib.elda.me.def
similarity index 100%
rename from definitions/mars/grib1.elda.me.def
rename to definitions/mars/grib.elda.me.def
diff --git a/definitions/mars/grib1.elda.ses.def b/definitions/mars/grib.elda.ses.def
similarity index 100%
rename from definitions/mars/grib1.elda.ses.def
rename to definitions/mars/grib.elda.ses.def
diff --git a/definitions/mars/grib.enda.4v.def b/definitions/mars/grib.enda.4v.def
new file mode 120000
index 000000000..347c47ad3
--- /dev/null
+++ b/definitions/mars/grib.enda.4v.def
@@ -0,0 +1 @@
+grib.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib.enda.an.def b/definitions/mars/grib.enda.an.def
new file mode 120000
index 000000000..347c47ad3
--- /dev/null
+++ b/definitions/mars/grib.enda.an.def
@@ -0,0 +1 @@
+grib.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enda.def b/definitions/mars/grib.enda.def
similarity index 100%
rename from definitions/mars/grib1.enda.def
rename to definitions/mars/grib.enda.def
diff --git a/definitions/mars/grib.enda.ea.def b/definitions/mars/grib.enda.ea.def
new file mode 120000
index 000000000..347c47ad3
--- /dev/null
+++ b/definitions/mars/grib.enda.ea.def
@@ -0,0 +1 @@
+grib.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib.enda.ef.def b/definitions/mars/grib.enda.ef.def
new file mode 120000
index 000000000..347c47ad3
--- /dev/null
+++ b/definitions/mars/grib.enda.ef.def
@@ -0,0 +1 @@
+grib.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enda.em.def b/definitions/mars/grib.enda.em.def
similarity index 100%
rename from definitions/mars/grib1.enda.em.def
rename to definitions/mars/grib.enda.em.def
diff --git a/definitions/mars/grib1.enda.es.def b/definitions/mars/grib.enda.es.def
similarity index 100%
rename from definitions/mars/grib1.enda.es.def
rename to definitions/mars/grib.enda.es.def
diff --git a/definitions/mars/grib1.enda.fc.def b/definitions/mars/grib.enda.fc.def
similarity index 100%
rename from definitions/mars/grib1.enda.fc.def
rename to definitions/mars/grib.enda.fc.def
diff --git a/definitions/mars/grib1.enda.ssd.def b/definitions/mars/grib.enda.ssd.def
similarity index 100%
rename from definitions/mars/grib1.enda.ssd.def
rename to definitions/mars/grib.enda.ssd.def
diff --git a/definitions/mars/grib.enda.sv.def b/definitions/mars/grib.enda.sv.def
new file mode 120000
index 000000000..347c47ad3
--- /dev/null
+++ b/definitions/mars/grib.enda.sv.def
@@ -0,0 +1 @@
+grib.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib.enda.svar.def b/definitions/mars/grib.enda.svar.def
new file mode 120000
index 000000000..347c47ad3
--- /dev/null
+++ b/definitions/mars/grib.enda.svar.def
@@ -0,0 +1 @@
+grib.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enfh.cf.def b/definitions/mars/grib.enfh.cf.def
similarity index 100%
rename from definitions/mars/grib1.enfh.cf.def
rename to definitions/mars/grib.enfh.cf.def
diff --git a/definitions/mars/grib1.enfh.fcmax.def b/definitions/mars/grib.enfh.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.enfh.fcmax.def
rename to definitions/mars/grib.enfh.fcmax.def
diff --git a/definitions/mars/grib1.enfh.fcmean.def b/definitions/mars/grib.enfh.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.enfh.fcmean.def
rename to definitions/mars/grib.enfh.fcmean.def
diff --git a/definitions/mars/grib1.enfh.fcmin.def b/definitions/mars/grib.enfh.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.enfh.fcmin.def
rename to definitions/mars/grib.enfh.fcmin.def
diff --git a/definitions/mars/grib1.enfh.fcstdev.def b/definitions/mars/grib.enfh.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.enfh.fcstdev.def
rename to definitions/mars/grib.enfh.fcstdev.def
diff --git a/definitions/mars/grib1.enfh.ff.def b/definitions/mars/grib.enfh.ff.def
similarity index 100%
rename from definitions/mars/grib1.enfh.ff.def
rename to definitions/mars/grib.enfh.ff.def
diff --git a/definitions/mars/grib1.enfh.icp.def b/definitions/mars/grib.enfh.icp.def
similarity index 100%
rename from definitions/mars/grib1.enfh.icp.def
rename to definitions/mars/grib.enfh.icp.def
diff --git a/definitions/mars/grib1.enfh.pf.def b/definitions/mars/grib.enfh.pf.def
similarity index 100%
rename from definitions/mars/grib1.enfh.pf.def
rename to definitions/mars/grib.enfh.pf.def
diff --git a/definitions/mars/grib1.enfh.tims.def b/definitions/mars/grib.enfh.tims.def
similarity index 100%
rename from definitions/mars/grib1.enfh.tims.def
rename to definitions/mars/grib.enfh.tims.def
diff --git a/definitions/mars/grib1.enfo.cf.def b/definitions/mars/grib.enfo.cf.def
similarity index 100%
rename from definitions/mars/grib1.enfo.cf.def
rename to definitions/mars/grib.enfo.cf.def
diff --git a/definitions/mars/grib1.enfo.ci.def b/definitions/mars/grib.enfo.ci.def
similarity index 100%
rename from definitions/mars/grib1.enfo.ci.def
rename to definitions/mars/grib.enfo.ci.def
diff --git a/definitions/mars/grib1.enfo.cm.def b/definitions/mars/grib.enfo.cm.def
similarity index 100%
rename from definitions/mars/grib1.enfo.cm.def
rename to definitions/mars/grib.enfo.cm.def
diff --git a/definitions/mars/grib1.enfo.cr.def b/definitions/mars/grib.enfo.cr.def
similarity index 100%
rename from definitions/mars/grib1.enfo.cr.def
rename to definitions/mars/grib.enfo.cr.def
diff --git a/definitions/mars/grib1.enfo.cs.def b/definitions/mars/grib.enfo.cs.def
similarity index 100%
rename from definitions/mars/grib1.enfo.cs.def
rename to definitions/mars/grib.enfo.cs.def
diff --git a/definitions/mars/grib1.enfo.cv.def b/definitions/mars/grib.enfo.cv.def
similarity index 100%
rename from definitions/mars/grib1.enfo.cv.def
rename to definitions/mars/grib.enfo.cv.def
diff --git a/definitions/mars/grib1.enfo.ed.def b/definitions/mars/grib.enfo.ed.def
similarity index 100%
rename from definitions/mars/grib1.enfo.ed.def
rename to definitions/mars/grib.enfo.ed.def
diff --git a/definitions/mars/grib1.enfo.ef.def b/definitions/mars/grib.enfo.ef.def
similarity index 100%
rename from definitions/mars/grib1.enfo.ef.def
rename to definitions/mars/grib.enfo.ef.def
diff --git a/definitions/mars/grib1.enfo.efi.def b/definitions/mars/grib.enfo.efi.def
similarity index 100%
rename from definitions/mars/grib1.enfo.efi.def
rename to definitions/mars/grib.enfo.efi.def
diff --git a/definitions/mars/grib1.enfo.efic.def b/definitions/mars/grib.enfo.efic.def
similarity index 100%
rename from definitions/mars/grib1.enfo.efic.def
rename to definitions/mars/grib.enfo.efic.def
diff --git a/definitions/mars/grib1.enfo.em.def b/definitions/mars/grib.enfo.em.def
similarity index 100%
rename from definitions/mars/grib1.enfo.em.def
rename to definitions/mars/grib.enfo.em.def
diff --git a/definitions/mars/grib1.enfo.ep.def b/definitions/mars/grib.enfo.ep.def
similarity index 100%
rename from definitions/mars/grib1.enfo.ep.def
rename to definitions/mars/grib.enfo.ep.def
diff --git a/definitions/mars/grib1.enfo.es.def b/definitions/mars/grib.enfo.es.def
similarity index 100%
rename from definitions/mars/grib1.enfo.es.def
rename to definitions/mars/grib.enfo.es.def
diff --git a/definitions/mars/grib1.enfo.fc.def b/definitions/mars/grib.enfo.fc.def
similarity index 100%
rename from definitions/mars/grib1.enfo.fc.def
rename to definitions/mars/grib.enfo.fc.def
diff --git a/definitions/mars/grib1.enfo.fcmax.def b/definitions/mars/grib.enfo.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.enfo.fcmax.def
rename to definitions/mars/grib.enfo.fcmax.def
diff --git a/definitions/mars/grib1.enfo.fcmean.def b/definitions/mars/grib.enfo.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.enfo.fcmean.def
rename to definitions/mars/grib.enfo.fcmean.def
diff --git a/definitions/mars/grib1.enfo.fcmin.def b/definitions/mars/grib.enfo.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.enfo.fcmin.def
rename to definitions/mars/grib.enfo.fcmin.def
diff --git a/definitions/mars/grib1.enfo.fcstdev.def b/definitions/mars/grib.enfo.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.enfo.fcstdev.def
rename to definitions/mars/grib.enfo.fcstdev.def
diff --git a/definitions/mars/grib1.enfo.ff.def b/definitions/mars/grib.enfo.ff.def
similarity index 100%
rename from definitions/mars/grib1.enfo.ff.def
rename to definitions/mars/grib.enfo.ff.def
diff --git a/definitions/mars/grib1.enfo.fp.def b/definitions/mars/grib.enfo.fp.def
similarity index 100%
rename from definitions/mars/grib1.enfo.fp.def
rename to definitions/mars/grib.enfo.fp.def
diff --git a/definitions/mars/grib1.enfo.icp.def b/definitions/mars/grib.enfo.icp.def
similarity index 100%
rename from definitions/mars/grib1.enfo.icp.def
rename to definitions/mars/grib.enfo.icp.def
diff --git a/definitions/mars/grib1.enfo.pb.def b/definitions/mars/grib.enfo.pb.def
similarity index 100%
rename from definitions/mars/grib1.enfo.pb.def
rename to definitions/mars/grib.enfo.pb.def
diff --git a/definitions/mars/grib1.enfo.pd.def b/definitions/mars/grib.enfo.pd.def
similarity index 100%
rename from definitions/mars/grib1.enfo.pd.def
rename to definitions/mars/grib.enfo.pd.def
diff --git a/definitions/mars/grib1.enfo.pf.def b/definitions/mars/grib.enfo.pf.def
similarity index 100%
rename from definitions/mars/grib1.enfo.pf.def
rename to definitions/mars/grib.enfo.pf.def
diff --git a/definitions/mars/grib1.enfo.sot.def b/definitions/mars/grib.enfo.sot.def
similarity index 100%
rename from definitions/mars/grib1.enfo.sot.def
rename to definitions/mars/grib.enfo.sot.def
diff --git a/definitions/mars/grib1.enfo.sv.def b/definitions/mars/grib.enfo.sv.def
similarity index 100%
rename from definitions/mars/grib1.enfo.sv.def
rename to definitions/mars/grib.enfo.sv.def
diff --git a/definitions/mars/grib1.enfo.svar.def b/definitions/mars/grib.enfo.svar.def
similarity index 100%
rename from definitions/mars/grib1.enfo.svar.def
rename to definitions/mars/grib.enfo.svar.def
diff --git a/definitions/mars/grib1.enfo.taem.def b/definitions/mars/grib.enfo.taem.def
similarity index 100%
rename from definitions/mars/grib1.enfo.taem.def
rename to definitions/mars/grib.enfo.taem.def
diff --git a/definitions/mars/grib1.enfo.taes.def b/definitions/mars/grib.enfo.taes.def
similarity index 100%
rename from definitions/mars/grib1.enfo.taes.def
rename to definitions/mars/grib.enfo.taes.def
diff --git a/definitions/mars/grib1.enfo.tu.def b/definitions/mars/grib.enfo.tu.def
similarity index 100%
rename from definitions/mars/grib1.enfo.tu.def
rename to definitions/mars/grib.enfo.tu.def
diff --git a/definitions/mars/grib1.enwh.cf.def b/definitions/mars/grib.enwh.cf.def
similarity index 100%
rename from definitions/mars/grib1.enwh.cf.def
rename to definitions/mars/grib.enwh.cf.def
diff --git a/definitions/mars/grib1.enwh.fcmax.def b/definitions/mars/grib.enwh.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.enwh.fcmax.def
rename to definitions/mars/grib.enwh.fcmax.def
diff --git a/definitions/mars/grib1.enwh.fcmean.def b/definitions/mars/grib.enwh.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.enwh.fcmean.def
rename to definitions/mars/grib.enwh.fcmean.def
diff --git a/definitions/mars/grib1.enwh.fcmin.def b/definitions/mars/grib.enwh.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.enwh.fcmin.def
rename to definitions/mars/grib.enwh.fcmin.def
diff --git a/definitions/mars/grib1.enwh.fcstdev.def b/definitions/mars/grib.enwh.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.enwh.fcstdev.def
rename to definitions/mars/grib.enwh.fcstdev.def
diff --git a/definitions/mars/grib1.enwh.pf.def b/definitions/mars/grib.enwh.pf.def
similarity index 100%
rename from definitions/mars/grib1.enwh.pf.def
rename to definitions/mars/grib.enwh.pf.def
diff --git a/definitions/mars/grib1.esmm.em.def b/definitions/mars/grib.esmm.em.def
similarity index 100%
rename from definitions/mars/grib1.esmm.em.def
rename to definitions/mars/grib.esmm.em.def
diff --git a/definitions/mars/grib1.espd.an.def b/definitions/mars/grib.espd.an.def
similarity index 100%
rename from definitions/mars/grib1.espd.an.def
rename to definitions/mars/grib.espd.an.def
diff --git a/definitions/mars/grib.ewda.4v.def b/definitions/mars/grib.ewda.4v.def
new file mode 120000
index 000000000..844ff2f71
--- /dev/null
+++ b/definitions/mars/grib.ewda.4v.def
@@ -0,0 +1 @@
+grib.ewda.def
\ No newline at end of file
diff --git a/definitions/mars/grib.ewda.an.def b/definitions/mars/grib.ewda.an.def
new file mode 120000
index 000000000..844ff2f71
--- /dev/null
+++ b/definitions/mars/grib.ewda.an.def
@@ -0,0 +1 @@
+grib.ewda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.ewda.def b/definitions/mars/grib.ewda.def
similarity index 100%
rename from definitions/mars/grib1.ewda.def
rename to definitions/mars/grib.ewda.def
diff --git a/definitions/mars/grib.ewda.fc.def b/definitions/mars/grib.ewda.fc.def
new file mode 120000
index 000000000..844ff2f71
--- /dev/null
+++ b/definitions/mars/grib.ewda.fc.def
@@ -0,0 +1 @@
+grib.ewda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.ewhc.cf.def b/definitions/mars/grib.ewhc.cf.def
similarity index 100%
rename from definitions/mars/grib1.ewhc.cf.def
rename to definitions/mars/grib.ewhc.cf.def
diff --git a/definitions/mars/grib1.ewhc.pf.def b/definitions/mars/grib.ewhc.pf.def
similarity index 100%
rename from definitions/mars/grib1.ewhc.pf.def
rename to definitions/mars/grib.ewhc.pf.def
diff --git a/definitions/mars/grib1.ewho.cf.def b/definitions/mars/grib.ewho.cf.def
similarity index 100%
rename from definitions/mars/grib1.ewho.cf.def
rename to definitions/mars/grib.ewho.cf.def
diff --git a/definitions/mars/grib1.ewho.pf.def b/definitions/mars/grib.ewho.pf.def
similarity index 100%
rename from definitions/mars/grib1.ewho.pf.def
rename to definitions/mars/grib.ewho.pf.def
diff --git a/definitions/mars/grib1.ewla.4v.def b/definitions/mars/grib.ewla.4v.def
similarity index 100%
rename from definitions/mars/grib1.ewla.4v.def
rename to definitions/mars/grib.ewla.4v.def
diff --git a/definitions/mars/grib1.ewla.an.def b/definitions/mars/grib.ewla.an.def
similarity index 100%
rename from definitions/mars/grib1.ewla.an.def
rename to definitions/mars/grib.ewla.an.def
diff --git a/definitions/mars/grib1.ewla.fc.def b/definitions/mars/grib.ewla.fc.def
similarity index 100%
rename from definitions/mars/grib1.ewla.fc.def
rename to definitions/mars/grib.ewla.fc.def
diff --git a/definitions/mars/grib1.ewmm.an.def b/definitions/mars/grib.ewmm.an.def
similarity index 100%
rename from definitions/mars/grib1.ewmm.an.def
rename to definitions/mars/grib.ewmm.an.def
diff --git a/definitions/mars/grib1.ewmm.cl.def b/definitions/mars/grib.ewmm.cl.def
similarity index 100%
rename from definitions/mars/grib1.ewmm.cl.def
rename to definitions/mars/grib.ewmm.cl.def
diff --git a/definitions/mars/grib1.ewmm.fc.def b/definitions/mars/grib.ewmm.fc.def
similarity index 100%
rename from definitions/mars/grib1.ewmm.fc.def
rename to definitions/mars/grib.ewmm.fc.def
diff --git a/definitions/mars/grib1.ewmo.an.def b/definitions/mars/grib.ewmo.an.def
similarity index 100%
rename from definitions/mars/grib1.ewmo.an.def
rename to definitions/mars/grib.ewmo.an.def
diff --git a/definitions/mars/grib1.ewmo.cl.def b/definitions/mars/grib.ewmo.cl.def
similarity index 100%
rename from definitions/mars/grib1.ewmo.cl.def
rename to definitions/mars/grib.ewmo.cl.def
diff --git a/definitions/mars/grib1.ewmo.def b/definitions/mars/grib.ewmo.def
similarity index 100%
rename from definitions/mars/grib1.ewmo.def
rename to definitions/mars/grib.ewmo.def
diff --git a/definitions/mars/grib1.ewmo.fc.def b/definitions/mars/grib.ewmo.fc.def
similarity index 100%
rename from definitions/mars/grib1.ewmo.fc.def
rename to definitions/mars/grib.ewmo.fc.def
diff --git a/definitions/mars/grib1.gfas.ga.def b/definitions/mars/grib.gfas.ga.def
similarity index 100%
rename from definitions/mars/grib1.gfas.ga.def
rename to definitions/mars/grib.gfas.ga.def
diff --git a/definitions/mars/grib1.gfas.gsd.def b/definitions/mars/grib.gfas.gsd.def
similarity index 100%
rename from definitions/mars/grib1.gfas.gsd.def
rename to definitions/mars/grib.gfas.gsd.def
diff --git a/definitions/mars/grib1.kwbc.pf.def b/definitions/mars/grib.kwbc.pf.def
similarity index 100%
rename from definitions/mars/grib1.kwbc.pf.def
rename to definitions/mars/grib.kwbc.pf.def
diff --git a/definitions/mars/grib1.lwda.4i.def b/definitions/mars/grib.lwda.4i.def
similarity index 100%
rename from definitions/mars/grib1.lwda.4i.def
rename to definitions/mars/grib.lwda.4i.def
diff --git a/definitions/mars/grib1.lwda.4v.def b/definitions/mars/grib.lwda.4v.def
similarity index 100%
rename from definitions/mars/grib1.lwda.4v.def
rename to definitions/mars/grib.lwda.4v.def
diff --git a/definitions/mars/grib1.lwda.an.def b/definitions/mars/grib.lwda.an.def
similarity index 100%
rename from definitions/mars/grib1.lwda.an.def
rename to definitions/mars/grib.lwda.an.def
diff --git a/definitions/mars/grib1.lwda.ea.def b/definitions/mars/grib.lwda.ea.def
similarity index 100%
rename from definitions/mars/grib1.lwda.ea.def
rename to definitions/mars/grib.lwda.ea.def
diff --git a/definitions/mars/grib1.lwda.ef.def b/definitions/mars/grib.lwda.ef.def
similarity index 100%
rename from definitions/mars/grib1.lwda.ef.def
rename to definitions/mars/grib.lwda.ef.def
diff --git a/definitions/mars/grib1.lwda.fc.def b/definitions/mars/grib.lwda.fc.def
similarity index 100%
rename from definitions/mars/grib1.lwda.fc.def
rename to definitions/mars/grib.lwda.fc.def
diff --git a/definitions/mars/grib1.lwda.me.def b/definitions/mars/grib.lwda.me.def
similarity index 100%
rename from definitions/mars/grib1.lwda.me.def
rename to definitions/mars/grib.lwda.me.def
diff --git a/definitions/mars/grib1.lwda.ssd.def b/definitions/mars/grib.lwda.ssd.def
similarity index 100%
rename from definitions/mars/grib1.lwda.ssd.def
rename to definitions/mars/grib.lwda.ssd.def
diff --git a/definitions/mars/grib1.lwwv.4v.def b/definitions/mars/grib.lwwv.4v.def
similarity index 100%
rename from definitions/mars/grib1.lwwv.4v.def
rename to definitions/mars/grib.lwwv.4v.def
diff --git a/definitions/mars/grib1.lwwv.an.def b/definitions/mars/grib.lwwv.an.def
similarity index 100%
rename from definitions/mars/grib1.lwwv.an.def
rename to definitions/mars/grib.lwwv.an.def
diff --git a/definitions/mars/grib1.lwwv.fc.def b/definitions/mars/grib.lwwv.fc.def
similarity index 100%
rename from definitions/mars/grib1.lwwv.fc.def
rename to definitions/mars/grib.lwwv.fc.def
diff --git a/definitions/mars/grib1.maed.an.def b/definitions/mars/grib.maed.an.def
similarity index 100%
rename from definitions/mars/grib1.maed.an.def
rename to definitions/mars/grib.maed.an.def
diff --git a/definitions/mars/grib1.maed.fc.def b/definitions/mars/grib.maed.fc.def
similarity index 100%
rename from definitions/mars/grib1.maed.fc.def
rename to definitions/mars/grib.maed.fc.def
diff --git a/definitions/mars/grib1.mawv.fc.def b/definitions/mars/grib.mawv.fc.def
similarity index 100%
rename from definitions/mars/grib1.mawv.fc.def
rename to definitions/mars/grib.mawv.fc.def
diff --git a/definitions/mars/grib1.mdfa.fc.def b/definitions/mars/grib.mdfa.fc.def
similarity index 100%
rename from definitions/mars/grib1.mdfa.fc.def
rename to definitions/mars/grib.mdfa.fc.def
diff --git a/definitions/mars/grib1.me.def b/definitions/mars/grib.me.def
similarity index 100%
rename from definitions/mars/grib1.me.def
rename to definitions/mars/grib.me.def
diff --git a/definitions/mars/grib1.mfam.em.def b/definitions/mars/grib.mfam.em.def
similarity index 100%
rename from definitions/mars/grib1.mfam.em.def
rename to definitions/mars/grib.mfam.em.def
diff --git a/definitions/mars/grib1.mfam.fcmean.def b/definitions/mars/grib.mfam.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mfam.fcmean.def
rename to definitions/mars/grib.mfam.fcmean.def
diff --git a/definitions/mars/grib1.mfam.fp.def b/definitions/mars/grib.mfam.fp.def
similarity index 100%
rename from definitions/mars/grib1.mfam.fp.def
rename to definitions/mars/grib.mfam.fp.def
diff --git a/definitions/mars/grib1.mfam.pb.def b/definitions/mars/grib.mfam.pb.def
similarity index 100%
rename from definitions/mars/grib1.mfam.pb.def
rename to definitions/mars/grib.mfam.pb.def
diff --git a/definitions/mars/grib1.mfam.pd.def b/definitions/mars/grib.mfam.pd.def
similarity index 100%
rename from definitions/mars/grib1.mfam.pd.def
rename to definitions/mars/grib.mfam.pd.def
diff --git a/definitions/mars/grib1.mfhm.em.def b/definitions/mars/grib.mfhm.em.def
similarity index 100%
rename from definitions/mars/grib1.mfhm.em.def
rename to definitions/mars/grib.mfhm.em.def
diff --git a/definitions/mars/grib1.mfhm.es.def b/definitions/mars/grib.mfhm.es.def
similarity index 100%
rename from definitions/mars/grib1.mfhm.es.def
rename to definitions/mars/grib.mfhm.es.def
diff --git a/definitions/mars/grib1.mfhm.fcmax.def b/definitions/mars/grib.mfhm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.mfhm.fcmax.def
rename to definitions/mars/grib.mfhm.fcmax.def
diff --git a/definitions/mars/grib1.mfhm.fcmean.def b/definitions/mars/grib.mfhm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mfhm.fcmean.def
rename to definitions/mars/grib.mfhm.fcmean.def
diff --git a/definitions/mars/grib1.mfhm.fcmin.def b/definitions/mars/grib.mfhm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.mfhm.fcmin.def
rename to definitions/mars/grib.mfhm.fcmin.def
diff --git a/definitions/mars/grib1.mfhm.fcstdev.def b/definitions/mars/grib.mfhm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.mfhm.fcstdev.def
rename to definitions/mars/grib.mfhm.fcstdev.def
diff --git a/definitions/mars/grib1.mfhw.cf.def b/definitions/mars/grib.mfhw.cf.def
similarity index 100%
rename from definitions/mars/grib1.mfhw.cf.def
rename to definitions/mars/grib.mfhw.cf.def
diff --git a/definitions/mars/grib1.mfhw.fc.def b/definitions/mars/grib.mfhw.fc.def
similarity index 100%
rename from definitions/mars/grib1.mfhw.fc.def
rename to definitions/mars/grib.mfhw.fc.def
diff --git a/definitions/mars/grib1.mfwm.fcmax.def b/definitions/mars/grib.mfwm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.mfwm.fcmax.def
rename to definitions/mars/grib.mfwm.fcmax.def
diff --git a/definitions/mars/grib1.mfwm.fcmean.def b/definitions/mars/grib.mfwm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mfwm.fcmean.def
rename to definitions/mars/grib.mfwm.fcmean.def
diff --git a/definitions/mars/grib1.mfwm.fcmin.def b/definitions/mars/grib.mfwm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.mfwm.fcmin.def
rename to definitions/mars/grib.mfwm.fcmin.def
diff --git a/definitions/mars/grib1.mfwm.fcstdev.def b/definitions/mars/grib.mfwm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.mfwm.fcstdev.def
rename to definitions/mars/grib.mfwm.fcstdev.def
diff --git a/definitions/mars/grib1.mhwm.fcmax.def b/definitions/mars/grib.mhwm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.mhwm.fcmax.def
rename to definitions/mars/grib.mhwm.fcmax.def
diff --git a/definitions/mars/grib1.mhwm.fcmean.def b/definitions/mars/grib.mhwm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mhwm.fcmean.def
rename to definitions/mars/grib.mhwm.fcmean.def
diff --git a/definitions/mars/grib1.mhwm.fcmin.def b/definitions/mars/grib.mhwm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.mhwm.fcmin.def
rename to definitions/mars/grib.mhwm.fcmin.def
diff --git a/definitions/mars/grib1.mhwm.fcstdev.def b/definitions/mars/grib.mhwm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.mhwm.fcstdev.def
rename to definitions/mars/grib.mhwm.fcstdev.def
diff --git a/definitions/mars/grib1.mmaf.fc.def b/definitions/mars/grib.mmaf.fc.def
similarity index 100%
rename from definitions/mars/grib1.mmaf.fc.def
rename to definitions/mars/grib.mmaf.fc.def
diff --git a/definitions/mars/grib1.mmaf.fcmean.def b/definitions/mars/grib.mmaf.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mmaf.fcmean.def
rename to definitions/mars/grib.mmaf.fcmean.def
diff --git a/definitions/mars/grib1.mmam.fcmean.def b/definitions/mars/grib.mmam.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mmam.fcmean.def
rename to definitions/mars/grib.mmam.fcmean.def
diff --git a/definitions/mars/grib1.mmsa.em.def b/definitions/mars/grib.mmsa.em.def
similarity index 100%
rename from definitions/mars/grib1.mmsa.em.def
rename to definitions/mars/grib.mmsa.em.def
diff --git a/definitions/mars/grib1.mmsa.fcmean.def b/definitions/mars/grib.mmsa.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mmsa.fcmean.def
rename to definitions/mars/grib.mmsa.fcmean.def
diff --git a/definitions/mars/grib1.mmsf.fc.def b/definitions/mars/grib.mmsf.fc.def
similarity index 100%
rename from definitions/mars/grib1.mmsf.fc.def
rename to definitions/mars/grib.mmsf.fc.def
diff --git a/definitions/mars/grib1.mmsf.icp.def b/definitions/mars/grib.mmsf.icp.def
similarity index 100%
rename from definitions/mars/grib1.mmsf.icp.def
rename to definitions/mars/grib.mmsf.icp.def
diff --git a/definitions/mars/grib1.mnfc.cf.def b/definitions/mars/grib.mnfc.cf.def
similarity index 100%
rename from definitions/mars/grib1.mnfc.cf.def
rename to definitions/mars/grib.mnfc.cf.def
diff --git a/definitions/mars/grib1.mnfc.ed.def b/definitions/mars/grib.mnfc.ed.def
similarity index 100%
rename from definitions/mars/grib1.mnfc.ed.def
rename to definitions/mars/grib.mnfc.ed.def
diff --git a/definitions/mars/grib1.mnfc.em.def b/definitions/mars/grib.mnfc.em.def
similarity index 100%
rename from definitions/mars/grib1.mnfc.em.def
rename to definitions/mars/grib.mnfc.em.def
diff --git a/definitions/mars/grib1.mnfc.es.def b/definitions/mars/grib.mnfc.es.def
similarity index 100%
rename from definitions/mars/grib1.mnfc.es.def
rename to definitions/mars/grib.mnfc.es.def
diff --git a/definitions/mars/grib1.mnfc.fc.def b/definitions/mars/grib.mnfc.fc.def
similarity index 100%
rename from definitions/mars/grib1.mnfc.fc.def
rename to definitions/mars/grib.mnfc.fc.def
diff --git a/definitions/mars/grib1.mnfc.ff.def b/definitions/mars/grib.mnfc.ff.def
similarity index 100%
rename from definitions/mars/grib1.mnfc.ff.def
rename to definitions/mars/grib.mnfc.ff.def
diff --git a/definitions/mars/grib1.mnfc.icp.def b/definitions/mars/grib.mnfc.icp.def
similarity index 100%
rename from definitions/mars/grib1.mnfc.icp.def
rename to definitions/mars/grib.mnfc.icp.def
diff --git a/definitions/mars/grib1.mnfc.of.def b/definitions/mars/grib.mnfc.of.def
similarity index 100%
rename from definitions/mars/grib1.mnfc.of.def
rename to definitions/mars/grib.mnfc.of.def
diff --git a/definitions/mars/grib1.mnfh.cf.def b/definitions/mars/grib.mnfh.cf.def
similarity index 100%
rename from definitions/mars/grib1.mnfh.cf.def
rename to definitions/mars/grib.mnfh.cf.def
diff --git a/definitions/mars/grib1.mnfh.ed.def b/definitions/mars/grib.mnfh.ed.def
similarity index 100%
rename from definitions/mars/grib1.mnfh.ed.def
rename to definitions/mars/grib.mnfh.ed.def
diff --git a/definitions/mars/grib1.mnfh.em.def b/definitions/mars/grib.mnfh.em.def
similarity index 100%
rename from definitions/mars/grib1.mnfh.em.def
rename to definitions/mars/grib.mnfh.em.def
diff --git a/definitions/mars/grib1.mnfh.es.def b/definitions/mars/grib.mnfh.es.def
similarity index 100%
rename from definitions/mars/grib1.mnfh.es.def
rename to definitions/mars/grib.mnfh.es.def
diff --git a/definitions/mars/grib1.mnfh.fc.def b/definitions/mars/grib.mnfh.fc.def
similarity index 100%
rename from definitions/mars/grib1.mnfh.fc.def
rename to definitions/mars/grib.mnfh.fc.def
diff --git a/definitions/mars/grib1.mnfh.icp.def b/definitions/mars/grib.mnfh.icp.def
similarity index 100%
rename from definitions/mars/grib1.mnfh.icp.def
rename to definitions/mars/grib.mnfh.icp.def
diff --git a/definitions/mars/grib1.mnfm.em.def b/definitions/mars/grib.mnfm.em.def
similarity index 100%
rename from definitions/mars/grib1.mnfm.em.def
rename to definitions/mars/grib.mnfm.em.def
diff --git a/definitions/mars/grib1.mnfm.es.def b/definitions/mars/grib.mnfm.es.def
similarity index 100%
rename from definitions/mars/grib1.mnfm.es.def
rename to definitions/mars/grib.mnfm.es.def
diff --git a/definitions/mars/grib1.mnfm.fcmax.def b/definitions/mars/grib.mnfm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.mnfm.fcmax.def
rename to definitions/mars/grib.mnfm.fcmax.def
diff --git a/definitions/mars/grib1.mnfm.fcmean.def b/definitions/mars/grib.mnfm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mnfm.fcmean.def
rename to definitions/mars/grib.mnfm.fcmean.def
diff --git a/definitions/mars/grib1.mnfm.fcmin.def b/definitions/mars/grib.mnfm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.mnfm.fcmin.def
rename to definitions/mars/grib.mnfm.fcmin.def
diff --git a/definitions/mars/grib1.mnfm.fcstdev.def b/definitions/mars/grib.mnfm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.mnfm.fcstdev.def
rename to definitions/mars/grib.mnfm.fcstdev.def
diff --git a/definitions/mars/grib1.mnfw.cf.def b/definitions/mars/grib.mnfw.cf.def
similarity index 100%
rename from definitions/mars/grib1.mnfw.cf.def
rename to definitions/mars/grib.mnfw.cf.def
diff --git a/definitions/mars/grib1.mnfw.fc.def b/definitions/mars/grib.mnfw.fc.def
similarity index 100%
rename from definitions/mars/grib1.mnfw.fc.def
rename to definitions/mars/grib.mnfw.fc.def
diff --git a/definitions/mars/grib1.mnth.an.def b/definitions/mars/grib.mnth.an.def
similarity index 100%
rename from definitions/mars/grib1.mnth.an.def
rename to definitions/mars/grib.mnth.an.def
diff --git a/definitions/mars/grib1.mnth.cl.def b/definitions/mars/grib.mnth.cl.def
similarity index 100%
rename from definitions/mars/grib1.mnth.cl.def
rename to definitions/mars/grib.mnth.cl.def
diff --git a/definitions/mars/grib1.mnth.fc.def b/definitions/mars/grib.mnth.fc.def
similarity index 100%
rename from definitions/mars/grib1.mnth.fc.def
rename to definitions/mars/grib.mnth.fc.def
diff --git a/definitions/mars/grib1.mnth.fg.def b/definitions/mars/grib.mnth.fg.def
similarity index 100%
rename from definitions/mars/grib1.mnth.fg.def
rename to definitions/mars/grib.mnth.fg.def
diff --git a/definitions/mars/grib1.mnth.ia.def b/definitions/mars/grib.mnth.ia.def
similarity index 100%
rename from definitions/mars/grib1.mnth.ia.def
rename to definitions/mars/grib.mnth.ia.def
diff --git a/definitions/mars/grib1.mnth.ssd.def b/definitions/mars/grib.mnth.ssd.def
similarity index 100%
rename from definitions/mars/grib1.mnth.ssd.def
rename to definitions/mars/grib.mnth.ssd.def
diff --git a/definitions/mars/grib1.moda.an.def b/definitions/mars/grib.moda.an.def
similarity index 100%
rename from definitions/mars/grib1.moda.an.def
rename to definitions/mars/grib.moda.an.def
diff --git a/definitions/mars/grib1.moda.cl.def b/definitions/mars/grib.moda.cl.def
similarity index 100%
rename from definitions/mars/grib1.moda.cl.def
rename to definitions/mars/grib.moda.cl.def
diff --git a/definitions/mars/grib1.moda.fc.def b/definitions/mars/grib.moda.fc.def
similarity index 100%
rename from definitions/mars/grib1.moda.fc.def
rename to definitions/mars/grib.moda.fc.def
diff --git a/definitions/mars/grib1.moda.ssd.def b/definitions/mars/grib.moda.ssd.def
similarity index 100%
rename from definitions/mars/grib1.moda.ssd.def
rename to definitions/mars/grib.moda.ssd.def
diff --git a/definitions/mars/grib1.mofc.cf.def b/definitions/mars/grib.mofc.cf.def
similarity index 100%
rename from definitions/mars/grib1.mofc.cf.def
rename to definitions/mars/grib.mofc.cf.def
diff --git a/definitions/mars/grib1.mofc.ed.def b/definitions/mars/grib.mofc.ed.def
similarity index 100%
rename from definitions/mars/grib1.mofc.ed.def
rename to definitions/mars/grib.mofc.ed.def
diff --git a/definitions/mars/grib1.mofc.em.def b/definitions/mars/grib.mofc.em.def
similarity index 100%
rename from definitions/mars/grib1.mofc.em.def
rename to definitions/mars/grib.mofc.em.def
diff --git a/definitions/mars/grib1.mofc.es.def b/definitions/mars/grib.mofc.es.def
similarity index 100%
rename from definitions/mars/grib1.mofc.es.def
rename to definitions/mars/grib.mofc.es.def
diff --git a/definitions/mars/grib1.mofc.fc.def b/definitions/mars/grib.mofc.fc.def
similarity index 100%
rename from definitions/mars/grib1.mofc.fc.def
rename to definitions/mars/grib.mofc.fc.def
diff --git a/definitions/mars/grib1.mofc.ff.def b/definitions/mars/grib.mofc.ff.def
similarity index 100%
rename from definitions/mars/grib1.mofc.ff.def
rename to definitions/mars/grib.mofc.ff.def
diff --git a/definitions/mars/grib1.mofc.of.def b/definitions/mars/grib.mofc.of.def
similarity index 100%
rename from definitions/mars/grib1.mofc.of.def
rename to definitions/mars/grib.mofc.of.def
diff --git a/definitions/mars/grib1.mofm.fcmax.def b/definitions/mars/grib.mofm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.mofm.fcmax.def
rename to definitions/mars/grib.mofm.fcmax.def
diff --git a/definitions/mars/grib1.mofm.fcmean.def b/definitions/mars/grib.mofm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.mofm.fcmean.def
rename to definitions/mars/grib.mofm.fcmean.def
diff --git a/definitions/mars/grib1.mofm.fcmin.def b/definitions/mars/grib.mofm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.mofm.fcmin.def
rename to definitions/mars/grib.mofm.fcmin.def
diff --git a/definitions/mars/grib1.mofm.fcstdev.def b/definitions/mars/grib.mofm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.mofm.fcstdev.def
rename to definitions/mars/grib.mofm.fcstdev.def
diff --git a/definitions/mars/grib1.mpic.s3.def b/definitions/mars/grib.mpic.s3.def
similarity index 100%
rename from definitions/mars/grib1.mpic.s3.def
rename to definitions/mars/grib.mpic.s3.def
diff --git a/definitions/mars/grib1.msda.an.def b/definitions/mars/grib.msda.an.def
similarity index 100%
rename from definitions/mars/grib1.msda.an.def
rename to definitions/mars/grib.msda.an.def
diff --git a/definitions/mars/grib1.msdc.an.def b/definitions/mars/grib.msdc.an.def
similarity index 100%
rename from definitions/mars/grib1.msdc.an.def
rename to definitions/mars/grib.msdc.an.def
diff --git a/definitions/mars/grib1.msdc.fc.def b/definitions/mars/grib.msdc.fc.def
similarity index 100%
rename from definitions/mars/grib1.msdc.fc.def
rename to definitions/mars/grib.msdc.fc.def
diff --git a/definitions/mars/grib1.msmm.em.def b/definitions/mars/grib.msmm.em.def
similarity index 100%
rename from definitions/mars/grib1.msmm.em.def
rename to definitions/mars/grib.msmm.em.def
diff --git a/definitions/mars/grib1.msmm.fcmax.def b/definitions/mars/grib.msmm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.msmm.fcmax.def
rename to definitions/mars/grib.msmm.fcmax.def
diff --git a/definitions/mars/grib1.msmm.fcmean.def b/definitions/mars/grib.msmm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.msmm.fcmean.def
rename to definitions/mars/grib.msmm.fcmean.def
diff --git a/definitions/mars/grib1.msmm.fcmin.def b/definitions/mars/grib.msmm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.msmm.fcmin.def
rename to definitions/mars/grib.msmm.fcmin.def
diff --git a/definitions/mars/grib1.msmm.fcstdev.def b/definitions/mars/grib.msmm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.msmm.fcstdev.def
rename to definitions/mars/grib.msmm.fcstdev.def
diff --git a/definitions/mars/grib.msmm.hcmean.def b/definitions/mars/grib.msmm.hcmean.def
new file mode 120000
index 000000000..0b5cb2f13
--- /dev/null
+++ b/definitions/mars/grib.msmm.hcmean.def
@@ -0,0 +1 @@
+grib.msmm.em.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.ocea.an.def b/definitions/mars/grib.ocea.an.def
similarity index 100%
rename from definitions/mars/grib1.ocea.an.def
rename to definitions/mars/grib.ocea.an.def
diff --git a/definitions/mars/grib1.ocea.ff.def b/definitions/mars/grib.ocea.ff.def
similarity index 100%
rename from definitions/mars/grib1.ocea.ff.def
rename to definitions/mars/grib.ocea.ff.def
diff --git a/definitions/mars/grib1.ocea.fx.def b/definitions/mars/grib.ocea.fx.def
similarity index 100%
rename from definitions/mars/grib1.ocea.fx.def
rename to definitions/mars/grib.ocea.fx.def
diff --git a/definitions/mars/grib1.ocea.of.def b/definitions/mars/grib.ocea.of.def
similarity index 100%
rename from definitions/mars/grib1.ocea.of.def
rename to definitions/mars/grib.ocea.of.def
diff --git a/definitions/mars/grib1.ocea.or.def b/definitions/mars/grib.ocea.or.def
similarity index 100%
rename from definitions/mars/grib1.ocea.or.def
rename to definitions/mars/grib.ocea.or.def
diff --git a/definitions/mars/grib1.oper.3v.def b/definitions/mars/grib.oper.3v.def
similarity index 100%
rename from definitions/mars/grib1.oper.3v.def
rename to definitions/mars/grib.oper.3v.def
diff --git a/definitions/mars/grib1.oper.4i.def b/definitions/mars/grib.oper.4i.def
similarity index 100%
rename from definitions/mars/grib1.oper.4i.def
rename to definitions/mars/grib.oper.4i.def
diff --git a/definitions/mars/grib1.oper.4v.def b/definitions/mars/grib.oper.4v.def
similarity index 100%
rename from definitions/mars/grib1.oper.4v.def
rename to definitions/mars/grib.oper.4v.def
diff --git a/definitions/mars/grib1.oper.an.def b/definitions/mars/grib.oper.an.def
similarity index 100%
rename from definitions/mars/grib1.oper.an.def
rename to definitions/mars/grib.oper.an.def
diff --git a/definitions/mars/grib1.oper.ea.def b/definitions/mars/grib.oper.ea.def
similarity index 100%
rename from definitions/mars/grib1.oper.ea.def
rename to definitions/mars/grib.oper.ea.def
diff --git a/definitions/mars/grib1.oper.ef.def b/definitions/mars/grib.oper.ef.def
similarity index 100%
rename from definitions/mars/grib1.oper.ef.def
rename to definitions/mars/grib.oper.ef.def
diff --git a/definitions/mars/grib1.oper.fa.def b/definitions/mars/grib.oper.fa.def
similarity index 100%
rename from definitions/mars/grib1.oper.fa.def
rename to definitions/mars/grib.oper.fa.def
diff --git a/definitions/mars/grib1.oper.fc.def b/definitions/mars/grib.oper.fc.def
similarity index 100%
rename from definitions/mars/grib1.oper.fc.def
rename to definitions/mars/grib.oper.fc.def
diff --git a/definitions/mars/grib1.oper.fg.def b/definitions/mars/grib.oper.fg.def
similarity index 100%
rename from definitions/mars/grib1.oper.fg.def
rename to definitions/mars/grib.oper.fg.def
diff --git a/definitions/mars/grib1.oper.go.def b/definitions/mars/grib.oper.go.def
similarity index 100%
rename from definitions/mars/grib1.oper.go.def
rename to definitions/mars/grib.oper.go.def
diff --git a/definitions/mars/grib1.oper.ia.def b/definitions/mars/grib.oper.ia.def
similarity index 100%
rename from definitions/mars/grib1.oper.ia.def
rename to definitions/mars/grib.oper.ia.def
diff --git a/definitions/mars/grib1.oper.im.def b/definitions/mars/grib.oper.im.def
similarity index 100%
rename from definitions/mars/grib1.oper.im.def
rename to definitions/mars/grib.oper.im.def
diff --git a/definitions/mars/grib.oper.me.def b/definitions/mars/grib.oper.me.def
new file mode 120000
index 000000000..3def55f94
--- /dev/null
+++ b/definitions/mars/grib.oper.me.def
@@ -0,0 +1 @@
+grib.me.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.oper.oi.def b/definitions/mars/grib.oper.oi.def
similarity index 100%
rename from definitions/mars/grib1.oper.oi.def
rename to definitions/mars/grib.oper.oi.def
diff --git a/definitions/mars/grib1.oper.si.def b/definitions/mars/grib.oper.si.def
similarity index 100%
rename from definitions/mars/grib1.oper.si.def
rename to definitions/mars/grib.oper.si.def
diff --git a/definitions/mars/grib1.oper.sim.def b/definitions/mars/grib.oper.sim.def
similarity index 100%
rename from definitions/mars/grib1.oper.sim.def
rename to definitions/mars/grib.oper.sim.def
diff --git a/definitions/mars/grib1.oper.ssd.def b/definitions/mars/grib.oper.ssd.def
similarity index 100%
rename from definitions/mars/grib1.oper.ssd.def
rename to definitions/mars/grib.oper.ssd.def
diff --git a/definitions/mars/grib1.scda.4i.def b/definitions/mars/grib.scda.4i.def
similarity index 100%
rename from definitions/mars/grib1.scda.4i.def
rename to definitions/mars/grib.scda.4i.def
diff --git a/definitions/mars/grib.scda.me.def b/definitions/mars/grib.scda.me.def
new file mode 120000
index 000000000..3def55f94
--- /dev/null
+++ b/definitions/mars/grib.scda.me.def
@@ -0,0 +1 @@
+grib.me.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.seap.an.def b/definitions/mars/grib.seap.an.def
similarity index 100%
rename from definitions/mars/grib1.seap.an.def
rename to definitions/mars/grib.seap.an.def
diff --git a/definitions/mars/grib1.seap.ef.def b/definitions/mars/grib.seap.ef.def
similarity index 100%
rename from definitions/mars/grib1.seap.ef.def
rename to definitions/mars/grib.seap.ef.def
diff --git a/definitions/mars/grib1.seap.es.def b/definitions/mars/grib.seap.es.def
similarity index 100%
rename from definitions/mars/grib1.seap.es.def
rename to definitions/mars/grib.seap.es.def
diff --git a/definitions/mars/grib1.seap.fc.def b/definitions/mars/grib.seap.fc.def
similarity index 100%
rename from definitions/mars/grib1.seap.fc.def
rename to definitions/mars/grib.seap.fc.def
diff --git a/definitions/mars/grib1.seap.sv.def b/definitions/mars/grib.seap.sv.def
similarity index 100%
rename from definitions/mars/grib1.seap.sv.def
rename to definitions/mars/grib.seap.sv.def
diff --git a/definitions/mars/grib1.seap.svar.def b/definitions/mars/grib.seap.svar.def
similarity index 100%
rename from definitions/mars/grib1.seap.svar.def
rename to definitions/mars/grib.seap.svar.def
diff --git a/definitions/mars/grib1.seas.an.def b/definitions/mars/grib.seas.an.def
similarity index 100%
rename from definitions/mars/grib1.seas.an.def
rename to definitions/mars/grib.seas.an.def
diff --git a/definitions/mars/grib1.seas.fc.def b/definitions/mars/grib.seas.fc.def
similarity index 100%
rename from definitions/mars/grib1.seas.fc.def
rename to definitions/mars/grib.seas.fc.def
diff --git a/definitions/mars/grib1.seas.ff.def b/definitions/mars/grib.seas.ff.def
similarity index 100%
rename from definitions/mars/grib1.seas.ff.def
rename to definitions/mars/grib.seas.ff.def
diff --git a/definitions/mars/grib1.seas.fx.def b/definitions/mars/grib.seas.fx.def
similarity index 100%
rename from definitions/mars/grib1.seas.fx.def
rename to definitions/mars/grib.seas.fx.def
diff --git a/definitions/mars/grib1.seas.of.def b/definitions/mars/grib.seas.of.def
similarity index 100%
rename from definitions/mars/grib1.seas.of.def
rename to definitions/mars/grib.seas.of.def
diff --git a/definitions/mars/grib1.seas.or.def b/definitions/mars/grib.seas.or.def
similarity index 100%
rename from definitions/mars/grib1.seas.or.def
rename to definitions/mars/grib.seas.or.def
diff --git a/definitions/mars/grib1.sens.me.def b/definitions/mars/grib.sens.me.def
similarity index 100%
rename from definitions/mars/grib1.sens.me.def
rename to definitions/mars/grib.sens.me.def
diff --git a/definitions/mars/grib1.sens.sf.def b/definitions/mars/grib.sens.sf.def
similarity index 100%
rename from definitions/mars/grib1.sens.sf.def
rename to definitions/mars/grib.sens.sf.def
diff --git a/definitions/mars/grib1.sens.sg.def b/definitions/mars/grib.sens.sg.def
similarity index 100%
rename from definitions/mars/grib1.sens.sg.def
rename to definitions/mars/grib.sens.sg.def
diff --git a/definitions/mars/grib1.sfmm.em.def b/definitions/mars/grib.sfmm.em.def
similarity index 100%
rename from definitions/mars/grib1.sfmm.em.def
rename to definitions/mars/grib.sfmm.em.def
diff --git a/definitions/mars/grib1.sfmm.fcmax.def b/definitions/mars/grib.sfmm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.sfmm.fcmax.def
rename to definitions/mars/grib.sfmm.fcmax.def
diff --git a/definitions/mars/grib1.sfmm.fcmean.def b/definitions/mars/grib.sfmm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.sfmm.fcmean.def
rename to definitions/mars/grib.sfmm.fcmean.def
diff --git a/definitions/mars/grib1.sfmm.fcmin.def b/definitions/mars/grib.sfmm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.sfmm.fcmin.def
rename to definitions/mars/grib.sfmm.fcmin.def
diff --git a/definitions/mars/grib1.sfmm.fcstdev.def b/definitions/mars/grib.sfmm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.sfmm.fcstdev.def
rename to definitions/mars/grib.sfmm.fcstdev.def
diff --git a/definitions/mars/grib1.smma.em.def b/definitions/mars/grib.smma.em.def
similarity index 100%
rename from definitions/mars/grib1.smma.em.def
rename to definitions/mars/grib.smma.em.def
diff --git a/definitions/mars/grib1.smma.fcmean.def b/definitions/mars/grib.smma.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.smma.fcmean.def
rename to definitions/mars/grib.smma.fcmean.def
diff --git a/definitions/mars/grib1.supd.an.def b/definitions/mars/grib.supd.an.def
similarity index 100%
rename from definitions/mars/grib1.supd.an.def
rename to definitions/mars/grib.supd.an.def
diff --git a/definitions/mars/grib1.swmm.fcmax.def b/definitions/mars/grib.swmm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.swmm.fcmax.def
rename to definitions/mars/grib.swmm.fcmax.def
diff --git a/definitions/mars/grib1.swmm.fcmean.def b/definitions/mars/grib.swmm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.swmm.fcmean.def
rename to definitions/mars/grib.swmm.fcmean.def
diff --git a/definitions/mars/grib1.swmm.fcmin.def b/definitions/mars/grib.swmm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.swmm.fcmin.def
rename to definitions/mars/grib.swmm.fcmin.def
diff --git a/definitions/mars/grib1.swmm.fcstdev.def b/definitions/mars/grib.swmm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.swmm.fcstdev.def
rename to definitions/mars/grib.swmm.fcstdev.def
diff --git a/definitions/mars/grib1.ukmo.s3.def b/definitions/mars/grib.ukmo.s3.def
similarity index 100%
rename from definitions/mars/grib1.ukmo.s3.def
rename to definitions/mars/grib.ukmo.s3.def
diff --git a/definitions/mars/grib1.waef.cv.def b/definitions/mars/grib.waef.cv.def
similarity index 100%
rename from definitions/mars/grib1.waef.cv.def
rename to definitions/mars/grib.waef.cv.def
diff --git a/definitions/mars/grib1.waef.efi.def b/definitions/mars/grib.waef.efi.def
similarity index 100%
rename from definitions/mars/grib1.waef.efi.def
rename to definitions/mars/grib.waef.efi.def
diff --git a/definitions/mars/grib1.waef.efic.def b/definitions/mars/grib.waef.efic.def
similarity index 100%
rename from definitions/mars/grib1.waef.efic.def
rename to definitions/mars/grib.waef.efic.def
diff --git a/definitions/mars/grib1.waef.ep.def b/definitions/mars/grib.waef.ep.def
similarity index 100%
rename from definitions/mars/grib1.waef.ep.def
rename to definitions/mars/grib.waef.ep.def
diff --git a/definitions/mars/grib1.waef.fcmax.def b/definitions/mars/grib.waef.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.waef.fcmax.def
rename to definitions/mars/grib.waef.fcmax.def
diff --git a/definitions/mars/grib1.waef.fcmean.def b/definitions/mars/grib.waef.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.waef.fcmean.def
rename to definitions/mars/grib.waef.fcmean.def
diff --git a/definitions/mars/grib1.waef.fcmin.def b/definitions/mars/grib.waef.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.waef.fcmin.def
rename to definitions/mars/grib.waef.fcmin.def
diff --git a/definitions/mars/grib1.waef.fcstdev.def b/definitions/mars/grib.waef.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.waef.fcstdev.def
rename to definitions/mars/grib.waef.fcstdev.def
diff --git a/definitions/mars/grib1.waef.fp.def b/definitions/mars/grib.waef.fp.def
similarity index 100%
rename from definitions/mars/grib1.waef.fp.def
rename to definitions/mars/grib.waef.fp.def
diff --git a/definitions/mars/grib1.waef.pf.def b/definitions/mars/grib.waef.pf.def
similarity index 100%
rename from definitions/mars/grib1.waef.pf.def
rename to definitions/mars/grib.waef.pf.def
diff --git a/definitions/mars/grib1.waef.sot.def b/definitions/mars/grib.waef.sot.def
similarity index 100%
rename from definitions/mars/grib1.waef.sot.def
rename to definitions/mars/grib.waef.sot.def
diff --git a/definitions/mars/grib1.wamd.an.def b/definitions/mars/grib.wamd.an.def
similarity index 100%
rename from definitions/mars/grib1.wamd.an.def
rename to definitions/mars/grib.wamd.an.def
diff --git a/definitions/mars/grib1.wamd.fc.def b/definitions/mars/grib.wamd.fc.def
similarity index 100%
rename from definitions/mars/grib1.wamd.fc.def
rename to definitions/mars/grib.wamd.fc.def
diff --git a/definitions/mars/grib1.wamf.cf.def b/definitions/mars/grib.wamf.cf.def
similarity index 100%
rename from definitions/mars/grib1.wamf.cf.def
rename to definitions/mars/grib.wamf.cf.def
diff --git a/definitions/mars/grib1.wamf.fc.def b/definitions/mars/grib.wamf.fc.def
similarity index 100%
rename from definitions/mars/grib1.wamf.fc.def
rename to definitions/mars/grib.wamf.fc.def
diff --git a/definitions/mars/grib1.wamo.an.def b/definitions/mars/grib.wamo.an.def
similarity index 100%
rename from definitions/mars/grib1.wamo.an.def
rename to definitions/mars/grib.wamo.an.def
diff --git a/definitions/mars/grib1.wamo.cl.def b/definitions/mars/grib.wamo.cl.def
similarity index 100%
rename from definitions/mars/grib1.wamo.cl.def
rename to definitions/mars/grib.wamo.cl.def
diff --git a/definitions/mars/grib1.wamo.fc.def b/definitions/mars/grib.wamo.fc.def
similarity index 100%
rename from definitions/mars/grib1.wamo.fc.def
rename to definitions/mars/grib.wamo.fc.def
diff --git a/definitions/mars/grib1.wasf.fc.def b/definitions/mars/grib.wasf.fc.def
similarity index 100%
rename from definitions/mars/grib1.wasf.fc.def
rename to definitions/mars/grib.wasf.fc.def
diff --git a/definitions/mars/grib.wave.4v.def b/definitions/mars/grib.wave.4v.def
new file mode 120000
index 000000000..72a1352d1
--- /dev/null
+++ b/definitions/mars/grib.wave.4v.def
@@ -0,0 +1 @@
+grib.wave.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.wave.an.def b/definitions/mars/grib.wave.an.def
similarity index 100%
rename from definitions/mars/grib1.wave.an.def
rename to definitions/mars/grib.wave.an.def
diff --git a/definitions/mars/grib1.wave.def b/definitions/mars/grib.wave.def
similarity index 100%
rename from definitions/mars/grib1.wave.def
rename to definitions/mars/grib.wave.def
diff --git a/definitions/mars/grib1.wave.fc.def b/definitions/mars/grib.wave.fc.def
similarity index 100%
rename from definitions/mars/grib1.wave.fc.def
rename to definitions/mars/grib.wave.fc.def
diff --git a/definitions/mars/grib1.wave.fg.def b/definitions/mars/grib.wave.fg.def
similarity index 100%
rename from definitions/mars/grib1.wave.fg.def
rename to definitions/mars/grib.wave.fg.def
diff --git a/definitions/mars/grib1.wehs.cd.def b/definitions/mars/grib.wehs.cd.def
similarity index 100%
rename from definitions/mars/grib1.wehs.cd.def
rename to definitions/mars/grib.wehs.cd.def
diff --git a/definitions/mars/grib1.wehs.ed.def b/definitions/mars/grib.wehs.ed.def
similarity index 100%
rename from definitions/mars/grib1.wehs.ed.def
rename to definitions/mars/grib.wehs.ed.def
diff --git a/definitions/mars/grib1.wehs.em.def b/definitions/mars/grib.wehs.em.def
similarity index 100%
rename from definitions/mars/grib1.wehs.em.def
rename to definitions/mars/grib.wehs.em.def
diff --git a/definitions/mars/grib1.wehs.es.def b/definitions/mars/grib.wehs.es.def
similarity index 100%
rename from definitions/mars/grib1.wehs.es.def
rename to definitions/mars/grib.wehs.es.def
diff --git a/definitions/mars/grib1.weov.pf.def b/definitions/mars/grib.weov.pf.def
similarity index 100%
rename from definitions/mars/grib1.weov.pf.def
rename to definitions/mars/grib.weov.pf.def
diff --git a/definitions/mars/grib1.wmfm.fcmax.def b/definitions/mars/grib.wmfm.fcmax.def
similarity index 100%
rename from definitions/mars/grib1.wmfm.fcmax.def
rename to definitions/mars/grib.wmfm.fcmax.def
diff --git a/definitions/mars/grib1.wmfm.fcmean.def b/definitions/mars/grib.wmfm.fcmean.def
similarity index 100%
rename from definitions/mars/grib1.wmfm.fcmean.def
rename to definitions/mars/grib.wmfm.fcmean.def
diff --git a/definitions/mars/grib1.wmfm.fcmin.def b/definitions/mars/grib.wmfm.fcmin.def
similarity index 100%
rename from definitions/mars/grib1.wmfm.fcmin.def
rename to definitions/mars/grib.wmfm.fcmin.def
diff --git a/definitions/mars/grib1.wmfm.fcstdev.def b/definitions/mars/grib.wmfm.fcstdev.def
similarity index 100%
rename from definitions/mars/grib1.wmfm.fcstdev.def
rename to definitions/mars/grib.wmfm.fcstdev.def
diff --git a/definitions/mars/grib1.dcda.me.def b/definitions/mars/grib1.dcda.me.def
deleted file mode 120000
index 353243e89..000000000
--- a/definitions/mars/grib1.dcda.me.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.me.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enda.4v.def b/definitions/mars/grib1.enda.4v.def
deleted file mode 120000
index 977ae5c33..000000000
--- a/definitions/mars/grib1.enda.4v.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enda.an.def b/definitions/mars/grib1.enda.an.def
deleted file mode 120000
index 977ae5c33..000000000
--- a/definitions/mars/grib1.enda.an.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enda.ea.def b/definitions/mars/grib1.enda.ea.def
deleted file mode 120000
index 977ae5c33..000000000
--- a/definitions/mars/grib1.enda.ea.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enda.ef.def b/definitions/mars/grib1.enda.ef.def
deleted file mode 120000
index 977ae5c33..000000000
--- a/definitions/mars/grib1.enda.ef.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enda.sv.def b/definitions/mars/grib1.enda.sv.def
deleted file mode 120000
index 977ae5c33..000000000
--- a/definitions/mars/grib1.enda.sv.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.enda.svar.def b/definitions/mars/grib1.enda.svar.def
deleted file mode 120000
index 977ae5c33..000000000
--- a/definitions/mars/grib1.enda.svar.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.enda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.ewda.4v.def b/definitions/mars/grib1.ewda.4v.def
deleted file mode 120000
index 6dec1a74d..000000000
--- a/definitions/mars/grib1.ewda.4v.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.ewda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.ewda.an.def b/definitions/mars/grib1.ewda.an.def
deleted file mode 120000
index 6dec1a74d..000000000
--- a/definitions/mars/grib1.ewda.an.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.ewda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.ewda.fc.def b/definitions/mars/grib1.ewda.fc.def
deleted file mode 120000
index 6dec1a74d..000000000
--- a/definitions/mars/grib1.ewda.fc.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.ewda.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.msmm.hcmean.def b/definitions/mars/grib1.msmm.hcmean.def
deleted file mode 120000
index d2737669b..000000000
--- a/definitions/mars/grib1.msmm.hcmean.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.msmm.em.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.oper.me.def b/definitions/mars/grib1.oper.me.def
deleted file mode 120000
index 353243e89..000000000
--- a/definitions/mars/grib1.oper.me.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.me.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.scda.me.def b/definitions/mars/grib1.scda.me.def
deleted file mode 120000
index 353243e89..000000000
--- a/definitions/mars/grib1.scda.me.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.me.def
\ No newline at end of file
diff --git a/definitions/mars/grib1.wave.4v.def b/definitions/mars/grib1.wave.4v.def
deleted file mode 120000
index ff3ce5247..000000000
--- a/definitions/mars/grib1.wave.4v.def
+++ /dev/null
@@ -1 +0,0 @@
-grib1.wave.def
\ No newline at end of file
diff --git a/definitions/x.grib b/definitions/x.grib
deleted file mode 100644
index 756534155..000000000
Binary files a/definitions/x.grib and /dev/null differ
diff --git a/tests/step.sh b/tests/step.sh
index f8df2e5f5..5399854ed 100755
--- a/tests/step.sh
+++ b/tests/step.sh
@@ -96,4 +96,3 @@ unit=`${tools_dir}grib_get -p indicatorOfUnitOfTimeRange $temp`
 
 rm -f $temp
 rm -f $grib2File.p8tmp ${grib2File}.tmp | true
-rm -f x.grib