diff --git a/ForwardDetectors/AFP/AFP_DBTools/scripts/testAFPDB.py b/ForwardDetectors/AFP/AFP_DBTools/scripts/testAFPDB.py
index 3cd948dfc9bc7410594aeeadad446c27d9093bee..c3f9a550e26f70ad16dceae5ec669b8b201f625f 100644
--- a/ForwardDetectors/AFP/AFP_DBTools/scripts/testAFPDB.py
+++ b/ForwardDetectors/AFP/AFP_DBTools/scripts/testAFPDB.py
@@ -16,7 +16,7 @@
 #               $ python testAFPDB.py --filesInput=/afs/cern.ch/user/p/pbalek/workspace/public/data17_13TeV.00333380.physics_Main.daq.RAW/data17_13TeV.00333380.physics_Main.daq.RAW._lb0163._SFO-7._0001.data
 #           3. the script will read the files and print out alignment variables for the events in the input file (based on run number and LB)
 
-#           footnote: for the python setup with TopLocRecSeq, see AFP_LocReco/AFP_LocReco_joboptions.py
+#           footnote: for the python setup with TopLocRecSeq, see AFP_LocReco/AFP_LocReco.py
 
 from AthenaConfiguration.ComponentAccumulator import CompFactory, ComponentAccumulator
 
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/AFP_GlobReco/AFP_GlobRecoTool.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/AFP_GlobReco/AFP_GlobRecoTool.h
index 8c92f16b1366313ff5d94c254e47100ec315d4a6..25063db14d73f80afa96c8021cec24f1395b14b8 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/AFP_GlobReco/AFP_GlobRecoTool.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/AFP_GlobReco/AFP_GlobRecoTool.h
@@ -49,7 +49,7 @@ private:
 
   /// @brief Array of *unique* write handle keys for track output containers
   ///
-  /// Each write handle key has to be unique and in sync with m_recoToolsList. It's possible for several track reco algorithms contributing to the common container. Ideally, one should setup track reco containers (in AFP_GlobReco/AFP_GlobReco_joboption.py) and let the python script pick unique names.
+  /// Each write handle key has to be unique and in sync with m_recoToolsList. It's possible for several track reco algorithms contributing to the common container. Ideally, one should setup track reco containers (in AFP_GlobReco/AFP_GlobReco.py) and let the python script pick unique names.
   SG::WriteHandleKeyArray<xAOD::AFPProtonContainer> m_arrayOfWriteHandleKeys{this, "AFPProtonContainerList", {"AFPProtonContainer"}, "List of output containers"};
 
   // monitoring tool to be added soon
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/CMakeLists.txt b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/CMakeLists.txt
index aef87be2a58c77f35faa38209d7f41da36925362..09a86aa735c912b9707413796bb58853498cbb68 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_add_component( AFP_GlobReco
 
 
 # Install files from the package:
-atlas_install_python_modules( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )   
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )   
 
 atlas_install_runtime( share/*.txt )
 
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/share/AFP_GlobReco_joboption.py b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/python/AFP_GlobReco.py
similarity index 100%
rename from ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/share/AFP_GlobReco_joboption.py
rename to ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/python/AFP_GlobReco.py
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/src/AFP_GlobRecoTool.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/src/AFP_GlobRecoTool.cxx
index 85429b306fa9a166b561f40f259aced9f206205d..6605f0202280381bca5463838265962f08f83468 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/src/AFP_GlobRecoTool.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/src/AFP_GlobRecoTool.cxx
@@ -22,7 +22,7 @@ StatusCode AFP_GlobRecoTool::initialize()
   // proton reconstruction tools
   if(m_recoToolsList.empty())
   {
-    ATH_MSG_ERROR("No proton reconstruction tools set, check settings in AFP_GlobReco/AFP_GlobReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("No proton reconstruction tools set, check settings in AFP_GlobReco/AFP_GlobReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   else
@@ -34,7 +34,7 @@ StatusCode AFP_GlobRecoTool::initialize()
   // output containers for the proton reconstruction tools
   if(m_arrayOfWriteHandleKeys.empty())
   {
-    ATH_MSG_ERROR("No output proton containers provided, check settings in AFP_GlobReco/AFP_GlobReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("No output proton containers provided, check settings in AFP_GlobReco/AFP_GlobReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   else
@@ -59,7 +59,7 @@ StatusCode AFP_GlobRecoTool::initialize()
   listOfWHKeys.erase(std::unique(listOfWHKeys.begin(),listOfWHKeys.end()), listOfWHKeys.end());
   if(listOfWHKeys.size() != all_WHkeys)
   {
-    ATH_MSG_ERROR("It seems write handle keys do not have unique values, check settings in AFP_GlobReco/AFP_GlobReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("It seems write handle keys do not have unique values, check settings in AFP_GlobReco/AFP_GlobReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   // get names from proton reco tools
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocRecoTool.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocRecoTool.h
index c50b9ebb15c34a595b247d5a2711176722e43f53..21902dd8ad4c559ad7c334b2efa99c6122d76c1e 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocRecoTool.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocRecoTool.h
@@ -53,7 +53,7 @@ private:
 
   /// @brief Array of *unique* write handle keys for track output containers
   ///
-  /// Each write handle key has to be unique and in sync with m_recoToolsList. It's possible for several track reco algorithms contributing to the common container. Ideally, one should setup track reco containers (in AFP_LocReco/AFP_LocReco_joboption.py) and let the python script pick unique names.
+  /// Each write handle key has to be unique and in sync with m_recoToolsList. It's possible for several track reco algorithms contributing to the common container. Ideally, one should setup track reco containers (in AFP_LocReco/AFP_LocReco.py) and let the python script pick unique names.
   SG::WriteHandleKeyArray<xAOD::AFPTrackContainer> m_arrayOfWriteHandleKeys{this, "AFPTrackContainerList", {"AFPTrackContainer"}, "List of output containers"};
 
   /// @ brief Monitoring tool
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_TDLocRecoTool.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_TDLocRecoTool.h
index e7fe8bc6dcc4910349d2658e9bf33eb3422b9e56..0d590ecde59cf22275e6675d25ac2f99d7d0afff 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_TDLocRecoTool.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_TDLocRecoTool.h
@@ -49,7 +49,7 @@ private:
 
   /// @brief Array of *unique* write handle keys for track output containers
   ///
-  /// Each write handle key has to be unique and in sync with m_recoToolsList. It's possible for several track reco algorithms contributing to the common container. Ideally, one should setup track reco containers (in AFP_LocReco/AFP_LocReco_joboption.py) and let the python script pick unique names.
+  /// Each write handle key has to be unique and in sync with m_recoToolsList. It's possible for several track reco algorithms contributing to the common container. Ideally, one should setup track reco containers (in AFP_LocReco/AFP_LocReco.py) and let the python script pick unique names.
   SG::WriteHandleKeyArray<xAOD::AFPToFTrackContainer> m_arrayOfWriteHandleKeys{this, "AFPToFTrackContainerList", {"AFPToFTrackContainer"}, "List of output containers"};
 };
 
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/CMakeLists.txt b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/CMakeLists.txt
index dbac2d9976598ad02d7af712ca34ee817a05f1eb..e597dd18b984c995bfefee14e62da0c19297497d 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/CMakeLists.txt
@@ -16,5 +16,5 @@ atlas_add_component( AFP_LocReco
 
 
 # Install files from the package:
-atlas_install_python_modules( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )   
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )   
 
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/share/AFP_LocReco_joboption.py b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/python/AFP_LocReco.py
similarity index 100%
rename from ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/share/AFP_LocReco_joboption.py
rename to ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/python/AFP_LocReco.py
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDLocRecoTool.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDLocRecoTool.cxx
index a471715247ed1d693fda70235fa7a6a91dcfc475..f1fb4b4ed2edd6f6a3a3529d3764952753478792 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDLocRecoTool.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_SIDLocRecoTool.cxx
@@ -22,7 +22,7 @@ StatusCode AFP_SIDLocRecoTool::initialize()
   // track reconstruction tools
   if(m_recoToolsList.empty())
   {
-    ATH_MSG_ERROR("No track reconstruction tools set, check settings in AFP_LocReco/AFP_LocReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("No track reconstruction tools set, check settings in AFP_LocReco/AFP_LocReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   else
@@ -33,7 +33,7 @@ StatusCode AFP_SIDLocRecoTool::initialize()
   // output containers for the track reconstruction tools
   if(m_arrayOfWriteHandleKeys.empty())
   {
-    ATH_MSG_ERROR("No output track containers provided, check settings in AFP_LocReco/AFP_LocReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("No output track containers provided, check settings in AFP_LocReco/AFP_LocReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   else
@@ -57,7 +57,7 @@ StatusCode AFP_SIDLocRecoTool::initialize()
   listOfWHKeys.erase(std::unique(listOfWHKeys.begin(),listOfWHKeys.end()), listOfWHKeys.end());
   if(listOfWHKeys.size() != all_WHkeys)
   {
-    ATH_MSG_ERROR("It seems write handle keys do not have unique values, check settings in AFP_LocReco/AFP_LocReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("It seems write handle keys do not have unique values, check settings in AFP_LocReco/AFP_LocReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   // get names from track reco tools
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDLocRecoTool.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDLocRecoTool.cxx
index 8d4a563cec236647ad3f8188e2d5d96b1d8001ad..052132f0a5df61e106b69199e477b2009e2cd267 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDLocRecoTool.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/AFP_TDLocRecoTool.cxx
@@ -22,7 +22,7 @@ StatusCode AFP_TDLocRecoTool::initialize()
 // track reconstruction tools
   if(m_recoToolsList.empty())
   {
-    ATH_MSG_ERROR("No track reconstruction tools set, check settings in AFP_LocReco/AFP_LocReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("No track reconstruction tools set, check settings in AFP_LocReco/AFP_LocReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   else
@@ -33,7 +33,7 @@ StatusCode AFP_TDLocRecoTool::initialize()
   // output containers for the track reconstruction tools
   if(m_arrayOfWriteHandleKeys.empty())
   {
-    ATH_MSG_ERROR("No output track containers provided, check settings in AFP_LocReco/AFP_LocReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("No output track containers provided, check settings in AFP_LocReco/AFP_LocReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   else
@@ -56,7 +56,7 @@ StatusCode AFP_TDLocRecoTool::initialize()
   listOfWHKeys.erase(std::unique(listOfWHKeys.begin(),listOfWHKeys.end()), listOfWHKeys.end());
   if(listOfWHKeys.size() != all_WHkeys)
   {
-    ATH_MSG_ERROR("It seems write handle keys do not have unique values, check settings in AFP_LocReco/AFP_LocReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("It seems write handle keys do not have unique values, check settings in AFP_LocReco/AFP_LocReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   // get names from track reco tools
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/CMakeLists.txt b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/CMakeLists.txt
index 260867c93717e39385fe3aaff74bdd51019feadf..c6ca8b119db443d12142e5f59b019b9d3584df51 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/CMakeLists.txt
@@ -20,4 +20,4 @@ atlas_add_component( AFP_SiClusterTools
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} AFP_SiClusterToolsLib )
 
 # Install files from the package:
-atlas_install_python_modules( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/share/AFP_SiClusterTools_joboption.py b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/python/AFP_SiClusterTools.py
similarity index 100%
rename from ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/share/AFP_SiClusterTools_joboption.py
rename to ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/python/AFP_SiClusterTools.py
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/AFP_VertexReco/AFP_VertexRecoTool.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/AFP_VertexReco/AFP_VertexRecoTool.h
index dfd2c0f173e23c15376bfe5c1ec2beedd827c6f1..623970151ef5d20ce61935ddcce320c56ec920f5 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/AFP_VertexReco/AFP_VertexRecoTool.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/AFP_VertexReco/AFP_VertexRecoTool.h
@@ -49,7 +49,7 @@ private:
 
   /// @brief Array of *unique* write handle keys for vertex output container
   ///
-  /// Each write handle key has to be unique and in sync with m_recoToolsList. It's possible for several time reco algorithms contributing to the common container. Ideally, one should setup vertex reco containers (in AFP_VertexReco/AFP_VertexReco_joboption.py) and let the python script pick unique names.
+  /// Each write handle key has to be unique and in sync with m_recoToolsList. It's possible for several time reco algorithms contributing to the common container. Ideally, one should setup vertex reco containers (in AFP_VertexReco/AFP_VertexReco.py) and let the python script pick unique names.
   SG::WriteHandleKeyArray<xAOD::AFPVertexContainer> m_arrayOfWriteHandleKeys{this, "AFPVertexContainerList", {"AFPVertexContainer"}, "List of output containers"};
 
   // monitoring tool to be added soon
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/CMakeLists.txt b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/CMakeLists.txt
index 88fcfa7baaa4f204237b56734985c4f5ee3fb5cc..517ff2e5228273535862b7a05f931543673d9783 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/CMakeLists.txt
@@ -14,4 +14,4 @@ atlas_add_component( AFP_VertexReco
 
 
 # Install files from the package:
-atlas_install_python_modules( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )   
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )   
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/share/AFP_VertexReco_joboption.py b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/python/AFP_VertexReco.py
similarity index 100%
rename from ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/share/AFP_VertexReco_joboption.py
rename to ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/python/AFP_VertexReco.py
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/src/AFP_VertexRecoTool.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/src/AFP_VertexRecoTool.cxx
index 27dff5e007ce24f36db73caadc68ee163a139c59..937218a9f4e435fed000b56dce3aeaf8d715bb01 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/src/AFP_VertexRecoTool.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/src/AFP_VertexRecoTool.cxx
@@ -22,7 +22,7 @@ StatusCode AFP_VertexRecoTool::initialize()
   // vertex reconstruction tools
   if(m_recoToolsList.empty())
   {
-    ATH_MSG_ERROR("No vertex reconstruction tools set, check settings in AFP_VertexReco/AFP_VertexReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("No vertex reconstruction tools set, check settings in AFP_VertexReco/AFP_VertexReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   else
@@ -34,7 +34,7 @@ StatusCode AFP_VertexRecoTool::initialize()
   // output containers for the vertex reconstruction tools
   if(m_arrayOfWriteHandleKeys.empty())
   {
-    ATH_MSG_ERROR("No output vertex containers provided, check settings in AFP_VertexReco/AFP_VertexReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("No output vertex containers provided, check settings in AFP_VertexReco/AFP_VertexReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   else
@@ -59,7 +59,7 @@ StatusCode AFP_VertexRecoTool::initialize()
   listOfWHKeys.erase(std::unique(listOfWHKeys.begin(),listOfWHKeys.end()), listOfWHKeys.end());
   if(listOfWHKeys.size() != all_WHkeys)
   {
-    ATH_MSG_ERROR("It seems write handle keys do not have unique values, check settings in AFP_VertexReco/AFP_VertexReco_joboption.py. Aborting.");
+    ATH_MSG_ERROR("It seems write handle keys do not have unique values, check settings in AFP_VertexReco/AFP_VertexReco.py. Aborting.");
     return StatusCode::FAILURE;
   }
   // get names from proton reco tools
diff --git a/ForwardDetectors/ForwardRec/share/ForwardRec_jobOptions.py b/ForwardDetectors/ForwardRec/share/ForwardRec_jobOptions.py
index 0bc296f66acb09708894b13844e247af4deade84..d9444d9b18666cddf9efedab17b794d0fa419836 100644
--- a/ForwardDetectors/ForwardRec/share/ForwardRec_jobOptions.py
+++ b/ForwardDetectors/ForwardRec/share/ForwardRec_jobOptions.py
@@ -51,19 +51,19 @@ if rec.doAFP() and rec.doESD():
     topSequence+=AFP_Raw2Digi()
   
   #cluster reconstruction
-  from AFP_SiClusterTools.AFP_SiClusterTools_joboption import AFP_SiClusterTools_Cfg
+  from AFP_SiClusterTools.AFP_SiClusterTools import AFP_SiClusterTools_Cfg
   topSequence+=AFP_SiClusterTools_Cfg()
   
   # tracks reconstruction
-  from AFP_LocReco.AFP_LocReco_joboption import AFP_LocReco_SiD_Cfg, AFP_LocReco_TD_Cfg
+  from AFP_LocReco.AFP_LocReco import AFP_LocReco_SiD_Cfg, AFP_LocReco_TD_Cfg
   topSequence+=AFP_LocReco_SiD_Cfg()
   topSequence+=AFP_LocReco_TD_Cfg()
    
   # protons reconstruction
-  from AFP_GlobReco.AFP_GlobReco_joboption import AFP_GlobReco_Cfg
+  from AFP_GlobReco.AFP_GlobReco import AFP_GlobReco_Cfg
   topSequence+=AFP_GlobReco_Cfg()
   
   # vertex reconstruction
-  from AFP_VertexReco.AFP_VertexReco_joboption import AFP_VertexReco_Cfg
+  from AFP_VertexReco.AFP_VertexReco import AFP_VertexReco_Cfg
   topSequence+=AFP_VertexReco_Cfg()
-  
\ No newline at end of file
+  
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py
index 4d3c5eacd1d8d647fcc279c59b06b59f18045d41..d3c2d3f853240fb017a028d8726f2471a523f5f4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/AFPMenuSequence.py
@@ -27,20 +27,20 @@ def AFPTrkRecoBaseSequence(ConfigFlags):
         AFP_R2D=CompFactory.AFP_Raw2Digi("AFP_Raw2Digi")
   
     #cluster reconstruction
-    from AFP_SiClusterTools.AFP_SiClusterTools_joboption import AFP_SiClusterTools_HLT
+    from AFP_SiClusterTools.AFP_SiClusterTools import AFP_SiClusterTools_HLT
     AFP_SiCl=AFP_SiClusterTools_HLT()
   
     # tracks reconstruction
-    from AFP_LocReco.AFP_LocReco_joboption import AFP_LocReco_SiD_HLT, AFP_LocReco_TD_HLT
+    from AFP_LocReco.AFP_LocReco import AFP_LocReco_SiD_HLT, AFP_LocReco_TD_HLT
     AFP_SID=AFP_LocReco_SiD_HLT()
     AFP_TD=AFP_LocReco_TD_HLT()
    
     # protons reconstruction
-    from AFP_GlobReco.AFP_GlobReco_joboption import AFP_GlobReco_HLT
+    from AFP_GlobReco.AFP_GlobReco import AFP_GlobReco_HLT
     AFP_Pr=AFP_GlobReco_HLT()
   
     # vertex reconstruction
-    from AFP_VertexReco.AFP_VertexReco_joboption import AFP_VertexReco_HLT
+    from AFP_VertexReco.AFP_VertexReco import AFP_VertexReco_HLT
     AFP_Vtx=AFP_VertexReco_HLT()
   
     if globalflags.InputFormat.is_bytestream():