diff --git a/hyb2oncArchive.trn b/hyb2oncArchive.trn
index cf2f33b..941cebd 100644
--- a/hyb2oncArchive.trn
+++ b/hyb2oncArchive.trn
@@ -15,7 +15,7 @@ End_Group
 
 Group = L0FileName
   Auto  
-  InputKey       = P_L0NAME
+  InputKey       = L0FILE
   InputPosition  = FitsLabels
   OutputName     = L0FileName
   OutputPosition = (Object, IsisCube, Group, Archive)
@@ -92,14 +92,14 @@ End_Group
 
 # the following image ID is assigned by the onboard image processor.
 # AMICA calls this one "ImageNumber"
-Group = ImageNumber
-  Auto
-  InputKey       = P_IMGID
-  InputPosition  = FitsExtras
-  OutputName     = ImageNumber
-  OutputPosition = (Object, IsisCube, Group, Instrument)
-  Translation    = (*, *)
-End_Group
+# Group = ImageNumber
+#   Auto
+#   InputKey       = P_IMGID
+#   InputPosition  = FitsExtras
+#   OutputName     = ImageNumber
+#   OutputPosition = (Object, IsisCube, Group, Instrument)
+#   Translation    = (*, *)
+# End_Group
 
 End
 
diff --git a/hyb2oncInstrument.trn b/hyb2oncInstrument.trn
index 136796b..7a03aab 100644
--- a/hyb2oncInstrument.trn
+++ b/hyb2oncInstrument.trn
@@ -15,7 +15,7 @@ End_Group
 
 Group = InstrumentId
   Auto
-  InputKey       = P_NAME
+  InputKey       = NAIFNAME
   InputPosition  = FitsLabels
   OutputName     = InstrumentId
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -78,7 +78,7 @@ End_Group
 
 Group = ExposureDuration
   Auto
-  InputKey       = EXPOSURE
+  InputKey       = XPOSURE
   InputPosition  = FitsLabels
   OutputName     = ExposureDuration
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -87,7 +87,7 @@ End_Group
 
 Group = SpacecraftClockStartCount
   Auto
-  InputKey       = P_SCCSC
+  InputKey       = SCCL-BEG
   InputPosition  = FitsLabels
   OutputName     = SpacecraftClockStartCount
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -96,7 +96,7 @@ End_Group
 
 Group = SpacecraftClockEndCount
   Auto
-  InputKey       = P_SCCEC
+  InputKey       = SCCL-END
   InputPosition  = FitsLabels
   OutputName     = SpacecraftClockStartCount
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -114,18 +114,18 @@ Group = RawSpacecraftClockCount
 End_Group
 
 #s/c counter at data recorded time
-Group = OnboardDataRecordedTime
-  Auto
-  InputKey       = P_RECTI
-  InputPosition  = FitsExtras
-  OutputName     = OnboardDataRecordedTime
-  OutputPosition = (Object, IsisCube, Group, Instrument)
-  Translation    = (*, *)
-End_Group
+#Group = OnboardDataRecordedTime
+#  Auto
+#  InputKey       = P_RECTI
+#  InputPosition  = FitsExtras
+#  OutputName     = OnboardDataRecordedTime
+#  OutputPosition = (Object, IsisCube, Group, Instrument)
+#  Translation    = (*, *)
+#End_Group
 
 Group = Binning
   Auto
-  InputKey       = P_BINN
+  InputKey       = NPIXBIN
   InputPosition  = FitsLabels
   OutputName     = Binning
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -135,7 +135,7 @@ End_Group
 # selected image areas (units: pixel coords of the detector):
 Group = SelectedImageAreaX1
   Auto
-  InputKey       = P_OPOSX1
+  InputKey       = ROI_LLX
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaX1
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -144,7 +144,7 @@ End_Group
 
 Group = SelectedImageAreaY1
   Auto
-  InputKey       = P_OPOSY1
+  InputKey       = ROI_LLY
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaY1
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -153,7 +153,7 @@ End_Group
 
 Group = SelectedImageAreaX2
   Auto
-  InputKey       = P_OPOSX2
+  InputKey       = ROI_URX
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaX2
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -162,48 +162,48 @@ End_Group
 
 Group = SelectedImageAreaY2
   Auto
-  InputKey       = P_OPOSY2
+  InputKey       = ROI_URY
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaY2
   OutputPosition = (Object, IsisCube, Group, Instrument)
   Translation    = (*, *)
 End_Group
 
-Group = SelectedImageAreaX3
-  Auto
-  InputKey       = P_OPOSX3
-  InputPosition  = FitsLabels
-  OutputName     = SelectedImageAreaX3
-  OutputPosition = (Object, IsisCube, Group, Instrument)
-  Translation    = (*, *)
-End_Group
-
-Group = SelectedImageAreaY3
-  Auto
-  InputKey       = P_OPOSY3
-  InputPosition  = FitsLabels
-  OutputName     = SelectedImageAreaY3
-  OutputPosition = (Object, IsisCube, Group, Instrument)
-  Translation    = (*, *)
-End_Group
-
-Group = SelectedImageAreaX4
-  Auto
-  InputKey       = P_OPOSX4
-  InputPosition  = FitsLabels
-  OutputName     = SelectedImageAreaX4
-  OutputPosition = (Object, IsisCube, Group, Instrument)
-  Translation    = (*, *)
-End_Group
-
-Group = SelectedImageAreaY4
-  Auto
-  InputKey       = P_OPOSY4
-  InputPosition  = FitsLabels
-  OutputName     = SelectedImageAreaY4
-  OutputPosition = (Object, IsisCube, Group, Instrument)
-  Translation    = (*, *)
-End_Group
+# Group = SelectedImageAreaX3
+#   Auto
+#   InputKey       = P_OPOSX3
+#   InputPosition  = FitsLabels
+#   OutputName     = SelectedImageAreaX3
+#   OutputPosition = (Object, IsisCube, Group, Instrument)
+#   Translation    = (*, *)
+# End_Group
+#
+# Group = SelectedImageAreaY3
+#   Auto
+#   InputKey       = P_OPOSY3
+#   InputPosition  = FitsLabels
+#   OutputName     = SelectedImageAreaY3
+#   OutputPosition = (Object, IsisCube, Group, Instrument)
+#   Translation    = (*, *)
+# End_Group
+#
+# Group = SelectedImageAreaX4
+#   Auto
+#   InputKey       = P_OPOSX4
+#   InputPosition  = FitsLabels
+#   OutputName     = SelectedImageAreaX4
+#   OutputPosition = (Object, IsisCube, Group, Instrument)
+#   Translation    = (*, *)
+# End_Group
+#
+# Group = SelectedImageAreaY4
+#   Auto
+#   InputKey       = P_OPOSY4
+#   InputPosition  = FitsLabels
+#   OutputName     = SelectedImageAreaY4
+#   OutputPosition = (Object, IsisCube, Group, Instrument)
+#   Translation    = (*, *)
+# End_Group
 
 Group = SmearCorrection
   Auto
@@ -216,7 +216,7 @@ End_Group
 
 Group = OffsetCorrection
   Auto
-  InputKey       = OFFSETCR
+  InputKey       = AOFFSET
   InputPosition  = FitsLabels
   OutputName     = OffsetCorrection
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -234,7 +234,7 @@ End_Group
 
 Group = RadianceConversion
   Auto
-  InputKey       = RADIANCE
+  InputKey       = RADCONV
   InputPosition  = FitsLabels
   OutputName     = RadianceConversion
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -261,25 +261,26 @@ End_Group
 
 Group = L2BFlatFileName
   Auto
-  InputKey       = L2BFLTFN
+  InputKey       = FLATFN
   InputPosition  = FitsLabels
   OutputName     = L2BFlatFileName
   OutputPosition = (Object, IsisCube, Group, Instrument)
   Translation    = (*, *)
 End_Group
 
-Group = L2BSystemEfficiencyFileName
-  Auto
-  InputKey       = L2BEFCFN
-  InputPosition  = FitsLabels
-  OutputName     = L2BSystemEfficiencyFileName
-  OutputPosition = (Object, IsisCube, Group, Instrument)
-  Translation    = (*, *)
-End_Group
+# Group = L2BSystemEfficiencyFileName
+#   Auto
+#   InputKey       = L2BEFCFN
+#   InputPosition  = FitsLabels
+#   OutputName     = L2BSystemEfficiencyFileName
+#   OutputPosition = (Object, IsisCube, Group, Instrument)
+#   Translation    = (*, *)
+# End_Group
 
+# FIXME, fits header only has shape filename "after L2E"
 Group = L2CShapeModelFileName
   Auto
-  InputKey       = L2CSHPFN
+  InputKey       = SHAPEFN
   InputPosition  = FitsLabels
   OutputName     = L2CShapeModelFileName
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -288,7 +289,7 @@ End_Group
 
 Group = L2DPhaseFunctionFileName
   Auto
-  InputKey       = L2DPHSFN
+  InputKey       = PHASEFN
   InputPosition  = FitsLabels
   OutputName     = L2DPhaseFunctionFileName
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -297,7 +298,7 @@ End_Group
 
 Group = L2DShapeModelFileName
   Auto
-  InputKey       = L2DSHPFN
+  InputKey       = SHAPEFN
   InputPosition  = FitsLabels
   OutputName     = L2DShapeModelFileName
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -305,14 +306,14 @@ Group = L2DShapeModelFileName
 End_Group
 
 # the following image ID is assigned by the onboard image processor:
-Group = ImageID
-  Auto
-  InputKey       = P_IMGID
-  InputPosition  = FitsExtras
-  OutputName     = ImageID
-  OutputPosition = (Object, IsisCube, Group, Instrument)
-  Translation    = (*, *)
-End_Group
+# Group = ImageID
+#   Auto
+#   InputKey       = P_IMGID
+#   InputPosition  = FitsExtras
+#   OutputName     = ImageID
+#   OutputPosition = (Object, IsisCube, Group, Instrument)
+#   Translation    = (*, *)
+# End_Group
 
 Group = SubImageCount
   Auto
@@ -464,7 +465,7 @@ End_Group
 # Output mode (compression type)
 Group = Compression
   Auto
-  InputKey       = P_CMPSTY
+  InputKey       = IMGCMPRV
   InputPosition  = FitsLabels
   OutputName     = Compression
   OutputPosition = (Object, IsisCube, Group, Instrument)