diff -u -r1.17 -r1.18
--- LcioFileNamer.cc	27 Apr 2007 01:54:34 -0000	1.17
+++ LcioFileNamer.cc	12 Sep 2007 19:40:49 -0000	1.18
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioFileNamer.cc,v 1.17 2007/04/27 01:54:34 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioFileNamer.cc,v 1.18 2007/09/12 19:40:49 jeremy Exp $

 #include "LcioFileNamer.hh"
 
 // lcdd

@@ -43,10 +43,7 @@

     std::string value;
 
     if ( field == "application" || field == "app" ) {

-      value = PackageInfo::getAbbrevString();
-    }
-    else if ( field == "version" || field == "ver" ) {
-      value = PackageInfo::getVersionString();

+      value = PackageInfo::getAbbrevString() + "-" + PackageInfo::getVersionString();

     }
     else if ( field == "geometry" || field == "geo" ) {
       value = LCDDProcessor::instance()->getDetectorName();

diff -u -r1.34 -r1.35
--- LcioMessenger.cc	27 Apr 2007 01:54:35 -0000	1.34
+++ LcioMessenger.cc	12 Sep 2007 19:40:49 -0000	1.35
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.34 2007/04/27 01:54:35 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.35 2007/09/12 19:40:49 jeremy Exp $

 #include "LcioMessenger.hh"
 
 // slic

@@ -152,7 +152,7 @@

     // enable autonaming
     m_autonameCmd = new G4UIcommand( "/lcio/autoname", this );
     m_autonameCmd->SetGuidance( "Set autonaming parameters." );

-    m_autonameCmd->SetGuidance("Valid autoname fields: application version geometry event eventNumber run binary physics date geant4");

+    m_autonameCmd->SetGuidance("Valid autoname fields: application geometry event eventNumber run binary physics date geant4");

     p = new G4UIparameter("autoname", 's', true );
     m_autonameCmd->SetParameter(p);