diff --git a/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py b/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
index 47565701eed43ae1f361fcbc1d180fff6e65b147..f7641bdb4b9714609b5d5499072bec1acff5c6bb 100644
--- a/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
+++ b/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
@@ -138,8 +138,9 @@ if False:
# Private Application Configuration options, replace with
# your configuration.
#--------------------------------------------------------------
-from TrigExMTHelloWorld.TrigExMTHelloWorldConf import MTHelloWorld
-HelloWorld = MTHelloWorld("HelloWorld")
+from AthExHelloWorld.AthExHelloWorldConf import HelloAlg
+
+HelloWorld = HelloAlg("HelloWorld")
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/CMakeLists.txt
deleted file mode 100644
index df8cabf10abdfc9fe8510d7e01b8684dea156c57..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-# Package: TrigExMTHelloWorld
-################################################################################
-
-# Declare the package name:
-atlas_subdir( TrigExMTHelloWorld )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- PRIVATE
- GaudiKernel )
-
-# Component(s) in the package:
-atlas_add_component( TrigExMTHelloWorld
- src/*.cxx
- src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel )
-
-# Install files from the package:
-atlas_install_headers( TrigExMTHelloWorld )
-atlas_install_joboptions( share/*.py )
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/TrigExMTHelloWorld/MTHelloWorld.h b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/TrigExMTHelloWorld/MTHelloWorld.h
deleted file mode 100755
index be909d1eeda5077a398f44aa622248c68c140542..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/TrigExMTHelloWorld/MTHelloWorld.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-/////////////////////////////////////////////////////////////////////////////
-
-class MTHelloWorld : public AthAlgorithm {
-public:
- MTHelloWorld (const std::string& name, ISvcLocator* pSvcLocator);
- virtual StatusCode initialize();
- virtual StatusCode execute();
- virtual StatusCode finalize();
- virtual StatusCode start();
- virtual StatusCode stop();
-
-private:
- IntegerProperty m_myInt;
- BooleanProperty m_myBool;
- DoubleProperty m_myDouble;
- StringArrayProperty m_myStringVec;
-};
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/share/MTHelloWorldOptions.py b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/share/MTHelloWorldOptions.py
deleted file mode 100755
index efd9114addf48e4b89b9c179e0b2f00035e58614..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/share/MTHelloWorldOptions.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#**************************************************************
-#
-# MTHelloWorld example
-#
-#==============================================================
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from AthenaCommon.Constants import *
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from TrigExMTHelloWorld.TrigExMTHelloWorldConf import MTHelloWorld
-HelloWorld = MTHelloWorld("HelloWorld")
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-topSequence += HelloWorld
-
-#--------------------------------------------------------------
-# Algorithms Private Options
-#--------------------------------------------------------------
-
-# For the genuine HelloWorld algorithm
-HelloWorld.MyInt = 42
-HelloWorld.MyBool = TRUE
-HelloWorld.MyDouble = 3.14159
-HelloWorld.MyStringVec = [ "Welcome", "to", "Athena", "Framework", "Tutorial" ]
-
-# For a special HelloWorld algorithm
-#HelloWorld__1 = Algorithm( "HelloWorld__1" )
-#HelloWorld__1.MyInt = 21
-#HelloWorld__1.MyBool = FALSE
-#HelloWorld__1.MyDouble = 6.28
-#HelloWorld__1.MyStringVec = [ "Welcome", "to", "Thread", "1" ]
-
-#==============================================================
-#
-# End of MTHelloWorld example
-#
-#**************************************************************
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/MTHelloWorld.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/MTHelloWorld.cxx
deleted file mode 100755
index a49b62308dcaf27930ff25f2cb5449ba05353eae..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/MTHelloWorld.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigExMTHelloWorld/MTHelloWorld.h"
-
-MTHelloWorld::MTHelloWorld(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
- m_myInt(0), m_myBool(0), m_myDouble(0)
-{
-
- // Part 2: Declare the properties
- declareProperty("MyInt", m_myInt);
- declareProperty("MyBool", m_myBool);
- declareProperty("MyDouble", m_myDouble);
-
- declareProperty("MyStringVec",m_myStringVec);
-
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-StatusCode MTHelloWorld::initialize()
-{
- ATH_MSG_INFO("initialize()");
-
-
- SmartIF<IService> tmp_msgSvc(msgSvc());
- if(tmp_msgSvc.isValid()) {
- ATH_MSG_INFO(" Algorithm = " << name() << " is connected to Message Service = " << tmp_msgSvc->name());
- }
-
- // Part 2: Print out the property values
- ATH_MSG_INFO(" MyInt = " << m_myInt);
- ATH_MSG_INFO(" MyBool = " << m_myBool);
- ATH_MSG_INFO(" MyDouble = " << m_myDouble);
-
- for (unsigned int i=0; i<m_myStringVec.value().size(); i++) {
- ATH_MSG_INFO(" MyStringVec[" << i << "] = " << (m_myStringVec.value())[i]);
- }
-
- return StatusCode::SUCCESS;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-StatusCode MTHelloWorld::execute()
-{
-
- ATH_MSG_INFO("execute()");
-
- // Part 1: Print out the different levels of messages
- ATH_MSG_DEBUG( "A DEBUG message");
- ATH_MSG_INFO( "An INFO message");
- ATH_MSG_WARNING( "A WARNING message");
- ATH_MSG_ERROR( "An ERROR message");
- ATH_MSG_FATAL( "A FATAL error message");
-
- return StatusCode::SUCCESS;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-StatusCode MTHelloWorld::finalize()
-{
- ATH_MSG_INFO( "finalize()");
- return StatusCode::SUCCESS;
-}
-
-StatusCode MTHelloWorld::start()
-{
- ATH_MSG_INFO( "start()");
- return StatusCode::SUCCESS;
-}
-
-StatusCode MTHelloWorld::stop()
-{
- ATH_MSG_INFO( "stop()");
- return StatusCode::SUCCESS;
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
deleted file mode 100644
index 9def105eb61f4422c7a1621ee7f98230f39d1e09..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "TrigExMTHelloWorld/MTHelloWorld.h"
-
-DECLARE_COMPONENT( MTHelloWorld )
-
diff --git a/Trigger/TrigValidation/TrigP1Test/share/part_lhl2ef_opt.py b/Trigger/TrigValidation/TrigP1Test/share/part_lhl2ef_opt.py
index b6453196fa9578a5c059cf95bf3436e9ebd3afd1..1d3deb1b6e0a62d2decfea767ccf746043a23e5a 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/part_lhl2ef_opt.py
+++ b/Trigger/TrigValidation/TrigP1Test/share/part_lhl2ef_opt.py
@@ -56,7 +56,7 @@ option['l2pu-worker'] = 1
# ================================
# Defines the L2 HLT Implementation to use. It has to be either a python dictionary (like the default argument), a dictionary that configures an HLTImplementation, or a string, that determines the path to the jobOptions to use. This parameter can also be set to dal.HLTImplementation object that will be used blindly to configure the L2 system at your partition.
-# option['l2-hlt'] = {'jobOptionsPath': 'TrigExMTHelloWorld/MTHelloWorldOptions.py'}
+# option['l2-hlt'] = {'jobOptionsPath': 'AthExHelloWorld/​HelloWorldOptions.py'}
# Defines the EF HLT Implementation to use. It has to be either a python dictionary (like the default argument), a dictionary that configures an HLTImplementation, or a string, that determines the path to the jobOptions to use. This parameter can also be set to dal.HLTImplementation object that will be used blindly to configure the EF system at your partition.
#option['ef-hlt'] = option['l2-hlt']