diff --git a/Control/AthenaPython/AthenaPython/PyAthenaAlg.h b/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
index 4079c2f492fd6aba3755691a96965343554799a4..0d1ddeec4ff0a6910acaedb91d8a003a7800db57 100644
--- a/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
+++ b/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
@@ -42,16 +42,16 @@ class Alg : virtual public ::IPyComponent,
   virtual ~Alg(); 
 
   // Framework's Hooks
-  virtual StatusCode initialize();
-  virtual StatusCode reinitialize();
-  virtual StatusCode beginRun();
-  virtual StatusCode execute();
-  virtual StatusCode endRun();
-  virtual StatusCode finalize();
+  virtual StatusCode initialize() override;
+  virtual StatusCode reinitialize() override;
+  virtual StatusCode start() override;
+  virtual StatusCode execute() override;
+  virtual StatusCode stop() override;
+  virtual StatusCode finalize() override;
 
-  virtual StatusCode sysInitialize();
+  virtual StatusCode sysInitialize() override;
 
-  virtual void resetExecuted();
+  virtual void resetExecuted() override;
 
   /////////////////////////////////////////////////////////////////// 
   // Const methods: 
@@ -61,7 +61,7 @@ class Alg : virtual public ::IPyComponent,
    *  This is used by concrete implementations to connect a python
    *  component to its C++ counter-part
    */
-  virtual const char* typeName() const;
+  virtual const char* typeName() const override;
 
   /////////////////////////////////////////////////////////////////// 
   // Non-const methods: 
@@ -69,7 +69,7 @@ class Alg : virtual public ::IPyComponent,
 
   /** @brief return associated python object. BORROWED reference.
    */ 
-  virtual PyObject* self() { return m_self; }
+  virtual PyObject* self() override { return m_self; }
 
   /////////////////////////////////////////////////////////////////// 
   // Protected methods: 
@@ -78,7 +78,7 @@ class Alg : virtual public ::IPyComponent,
 
   /** attach the C++ component to its python cousin
    */
-  virtual bool setPyAttr( PyObject* pyobj );
+  virtual bool setPyAttr( PyObject* pyobj ) override;
 
   /////////////////////////////////////////////////////////////////// 
   // Private data: 
diff --git a/Control/AthenaPython/python/PyAthenaComps.py b/Control/AthenaPython/python/PyAthenaComps.py
index c0424db16d19dc310e85c8cc3de482965bba43fb..e4efef9a384d5cde63c9a6dd7611443b076b71c7 100644
--- a/Control/AthenaPython/python/PyAthenaComps.py
+++ b/Control/AthenaPython/python/PyAthenaComps.py
@@ -126,16 +126,16 @@ class Alg( CfgPyAlgorithm ):
     def finalize(self):
         return StatusCode.Success
 
-    def sysBeginRun(self):
-        return self.beginRun()
+    def sysStart(self):
+        return self.start()
     
-    def beginRun(self):
+    def start(self):
         return StatusCode.Success
 
-    def sysEndRun(self):
-        return self.endRun()
+    def sysStop(self):
+        return self.stop()
     
-    def endRun(self):
+    def stop(self):
         return StatusCode.Success
 
     def filterPassed(self):
diff --git a/Control/AthenaPython/src/PyAthenaAlg.cxx b/Control/AthenaPython/src/PyAthenaAlg.cxx
index b5c8a6e2dcb6addf4f03bafd4c499f619dd44a94..32ec5019107318d40e03a335702a7a4983e53af9 100644
--- a/Control/AthenaPython/src/PyAthenaAlg.cxx
+++ b/Control/AthenaPython/src/PyAthenaAlg.cxx
@@ -71,15 +71,15 @@ Alg::reinitialize()
 }
 
 StatusCode 
-Alg::beginRun()
+Alg::start()
 { 
-  return PyAthena::callPyMethod( m_self, "sysBeginRun" );
+  return PyAthena::callPyMethod( m_self, "sysStart" );
 }
 
 StatusCode 
-Alg::endRun()
+Alg::stop()
 {
-  return PyAthena::callPyMethod( m_self, "sysEndRun" );
+  return PyAthena::callPyMethod( m_self, "sysStop" );
 }
 
 StatusCode