diff --git a/framework/src/base/Moose.C b/framework/src/base/Moose.C
index 43e06239150b..3323cd64979a 100644
--- a/framework/src/base/Moose.C
+++ b/framework/src/base/Moose.C
@@ -46,7 +46,7 @@ namespace Moose
 void
 registerObjects(Factory & factory)
 {
-  registerObjects(factory, {"MooseApp", factory.app().type()});
+  registerObjects(factory, {"MooseApp"});
 }
 
 void
diff --git a/tutorials/darcy_thermo_mech/step01_diffusion/include/base/DarcyThermoMechApp.h b/tutorials/darcy_thermo_mech/step01_diffusion/include/base/DarcyThermoMechApp.h
index 419cb563118e..985c1ffd6857 100644
--- a/tutorials/darcy_thermo_mech/step01_diffusion/include/base/DarcyThermoMechApp.h
+++ b/tutorials/darcy_thermo_mech/step01_diffusion/include/base/DarcyThermoMechApp.h
@@ -23,7 +23,6 @@ class DarcyThermoMechApp : public MooseApp
   DarcyThermoMechApp(InputParameters parameters);
 
   static void registerApps();
-  static void registerObjects(Factory & factory);
   static void associateSyntax(Syntax & syntax, ActionFactory & action_factory);
 };
 
diff --git a/tutorials/darcy_thermo_mech/step01_diffusion/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step01_diffusion/src/base/DarcyThermoMechApp.C
index c7f0998eaf12..f9778e24ba6b 100644
--- a/tutorials/darcy_thermo_mech/step01_diffusion/src/base/DarcyThermoMechApp.C
+++ b/tutorials/darcy_thermo_mech/step01_diffusion/src/base/DarcyThermoMechApp.C
@@ -26,8 +26,8 @@ validParams<DarcyThermoMechApp>()
 DarcyThermoMechApp::DarcyThermoMechApp(InputParameters parameters) : MooseApp(parameters)
 {
   Moose::registerObjects(_factory);
+  Registry::registerObjectsTo(_factory, {type()});
   ModulesApp::registerObjects(_factory);
-  DarcyThermoMechApp::registerObjects(_factory);
 
   Moose::associateSyntax(_syntax, _action_factory);
   ModulesApp::associateSyntax(_syntax, _action_factory);
@@ -40,11 +40,6 @@ DarcyThermoMechApp::registerApps()
   registerApp(DarcyThermoMechApp);
 }
 
-void
-DarcyThermoMechApp::registerObjects(Factory & /*factory*/)
-{
-}
-
 void
 DarcyThermoMechApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
 {
diff --git a/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C
deleted file mode 100644
index 4902efff6f82..000000000000
--- a/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C
+++ /dev/null
@@ -1,53 +0,0 @@
-//* This file is part of the MOOSE framework
-//* https://www.mooseframework.org
-//*
-//* All rights reserved, see COPYRIGHT for full restrictions
-//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
-//*
-//* Licensed under LGPL 2.1, please see LICENSE for details
-//* https://www.gnu.org/licenses/lgpl-2.1.html
-
-// Tutorial Includes
-#include "DarcyThermoMechApp.h"
-#include "DarcyPressure.h"
-
-// Moose Includes
-#include "AppFactory.h"
-#include "MooseSyntax.h"
-#include "ModulesApp.h"
-
-template <>
-InputParameters
-validParams<DarcyThermoMechApp>()
-{
-  InputParameters params = validParams<MooseApp>();
-  return params;
-}
-
-DarcyThermoMechApp::DarcyThermoMechApp(InputParameters parameters) : MooseApp(parameters)
-{
-  Moose::registerObjects(_factory);
-  ModulesApp::registerObjects(_factory);
-  DarcyThermoMechApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ModulesApp::associateSyntax(_syntax, _action_factory);
-  DarcyThermoMechApp::associateSyntax(_syntax, _action_factory);
-}
-
-void
-DarcyThermoMechApp::registerApps()
-{
-  registerApp(DarcyThermoMechApp);
-}
-
-void
-DarcyThermoMechApp::registerObjects(Factory & factory)
-{
-  registerKernel(DarcyPressure);
-}
-
-void
-DarcyThermoMechApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
-{
-}
diff --git a/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C
new file mode 120000
index 000000000000..9e9fd062dfd9
--- /dev/null
+++ b/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/kernels/DarcyPressure.C b/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/kernels/DarcyPressure.C
index dfc39d1fcaf1..43aace4d6a4e 100644
--- a/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/kernels/DarcyPressure.C
+++ b/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/kernels/DarcyPressure.C
@@ -9,6 +9,8 @@
 
 #include "DarcyPressure.h"
 
+registerMooseObject("DarcyThermoMechApp", DarcyPressure);
+
 template <>
 InputParameters
 validParams<DarcyPressure>()
diff --git a/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C
deleted file mode 100644
index 9b3e1adf8bc3..000000000000
--- a/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C
+++ /dev/null
@@ -1,55 +0,0 @@
-//* This file is part of the MOOSE framework
-//* https://www.mooseframework.org
-//*
-//* All rights reserved, see COPYRIGHT for full restrictions
-//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
-//*
-//* Licensed under LGPL 2.1, please see LICENSE for details
-//* https://www.gnu.org/licenses/lgpl-2.1.html
-
-// Tutorial Includes
-#include "DarcyThermoMechApp.h"
-#include "DarcyPressure.h"
-#include "PackedColumn.h"
-
-// Moose Includes
-#include "AppFactory.h"
-#include "MooseSyntax.h"
-#include "ModulesApp.h"
-
-template <>
-InputParameters
-validParams<DarcyThermoMechApp>()
-{
-  InputParameters params = validParams<MooseApp>();
-  return params;
-}
-
-DarcyThermoMechApp::DarcyThermoMechApp(InputParameters parameters) : MooseApp(parameters)
-{
-  Moose::registerObjects(_factory);
-  ModulesApp::registerObjects(_factory);
-  DarcyThermoMechApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ModulesApp::associateSyntax(_syntax, _action_factory);
-  DarcyThermoMechApp::associateSyntax(_syntax, _action_factory);
-}
-
-void
-DarcyThermoMechApp::registerApps()
-{
-  registerApp(DarcyThermoMechApp);
-}
-
-void
-DarcyThermoMechApp::registerObjects(Factory & factory)
-{
-  registerKernel(DarcyPressure);
-  registerMaterial(PackedColumn);
-}
-
-void
-DarcyThermoMechApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
-{
-}
diff --git a/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C
new file mode 120000
index 000000000000..9e9fd062dfd9
--- /dev/null
+++ b/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step03_darcy_material/src/kernels/DarcyPressure.C b/tutorials/darcy_thermo_mech/step03_darcy_material/src/kernels/DarcyPressure.C
index 020896580b67..2d6bec33323f 100644
--- a/tutorials/darcy_thermo_mech/step03_darcy_material/src/kernels/DarcyPressure.C
+++ b/tutorials/darcy_thermo_mech/step03_darcy_material/src/kernels/DarcyPressure.C
@@ -9,6 +9,8 @@
 
 #include "DarcyPressure.h"
 
+registerMooseObject("DarcyThermoMechApp", DarcyPressure);
+
 template <>
 InputParameters
 validParams<DarcyPressure>()
diff --git a/tutorials/darcy_thermo_mech/step03_darcy_material/src/materials/PackedColumn.C b/tutorials/darcy_thermo_mech/step03_darcy_material/src/materials/PackedColumn.C
index c912f2002f96..6a43fe9c42d2 100644
--- a/tutorials/darcy_thermo_mech/step03_darcy_material/src/materials/PackedColumn.C
+++ b/tutorials/darcy_thermo_mech/step03_darcy_material/src/materials/PackedColumn.C
@@ -9,6 +9,8 @@
 
 #include "PackedColumn.h"
 
+registerMooseObject("DarcyThermoMechApp", PackedColumn);
+
 template <>
 InputParameters
 validParams<PackedColumn>()
diff --git a/tutorials/darcy_thermo_mech/step04_velocity_aux/src/auxkernels/DarcyVelocity.C b/tutorials/darcy_thermo_mech/step04_velocity_aux/src/auxkernels/DarcyVelocity.C
index a4ad325d152a..5d7935d1e67b 100644
--- a/tutorials/darcy_thermo_mech/step04_velocity_aux/src/auxkernels/DarcyVelocity.C
+++ b/tutorials/darcy_thermo_mech/step04_velocity_aux/src/auxkernels/DarcyVelocity.C
@@ -9,6 +9,8 @@
 
 #include "DarcyVelocity.h"
 
+registerMooseObject("DarcyThermoMechApp", DarcyVelocity);
+
 template <>
 InputParameters
 validParams<DarcyVelocity>()
diff --git a/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C
deleted file mode 100644
index c01ff2305fd9..000000000000
--- a/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C
+++ /dev/null
@@ -1,57 +0,0 @@
-//* This file is part of the MOOSE framework
-//* https://www.mooseframework.org
-//*
-//* All rights reserved, see COPYRIGHT for full restrictions
-//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
-//*
-//* Licensed under LGPL 2.1, please see LICENSE for details
-//* https://www.gnu.org/licenses/lgpl-2.1.html
-
-// Tutorial Includes
-#include "DarcyThermoMechApp.h"
-#include "DarcyPressure.h"
-#include "PackedColumn.h"
-#include "DarcyVelocity.h"
-
-// Moose Includes
-#include "AppFactory.h"
-#include "MooseSyntax.h"
-#include "ModulesApp.h"
-
-template <>
-InputParameters
-validParams<DarcyThermoMechApp>()
-{
-  InputParameters params = validParams<MooseApp>();
-  return params;
-}
-
-DarcyThermoMechApp::DarcyThermoMechApp(InputParameters parameters) : MooseApp(parameters)
-{
-  Moose::registerObjects(_factory);
-  ModulesApp::registerObjects(_factory);
-  DarcyThermoMechApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ModulesApp::associateSyntax(_syntax, _action_factory);
-  DarcyThermoMechApp::associateSyntax(_syntax, _action_factory);
-}
-
-void
-DarcyThermoMechApp::registerApps()
-{
-  registerApp(DarcyThermoMechApp);
-}
-
-void
-DarcyThermoMechApp::registerObjects(Factory & factory)
-{
-  registerKernel(DarcyPressure);
-  registerMaterial(PackedColumn);
-  registerAux(DarcyVelocity);
-}
-
-void
-DarcyThermoMechApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
-{
-}
diff --git a/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C
new file mode 120000
index 000000000000..9e9fd062dfd9
--- /dev/null
+++ b/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C
deleted file mode 100644
index 56b6dc26eac9..000000000000
--- a/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C
+++ /dev/null
@@ -1,59 +0,0 @@
-//* This file is part of the MOOSE framework
-//* https://www.mooseframework.org
-//*
-//* All rights reserved, see COPYRIGHT for full restrictions
-//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
-//*
-//* Licensed under LGPL 2.1, please see LICENSE for details
-//* https://www.gnu.org/licenses/lgpl-2.1.html
-
-// Tutorial Includes
-#include "DarcyThermoMechApp.h"
-#include "DarcyPressure.h"
-#include "HeatConductionOutflow.h"
-#include "PackedColumn.h"
-#include "DarcyVelocity.h"
-
-// Moose Includes
-#include "AppFactory.h"
-#include "MooseSyntax.h"
-#include "ModulesApp.h"
-
-template <>
-InputParameters
-validParams<DarcyThermoMechApp>()
-{
-  InputParameters params = validParams<MooseApp>();
-  return params;
-}
-
-DarcyThermoMechApp::DarcyThermoMechApp(InputParameters parameters) : MooseApp(parameters)
-{
-  Moose::registerObjects(_factory);
-  ModulesApp::registerObjects(_factory);
-  DarcyThermoMechApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ModulesApp::associateSyntax(_syntax, _action_factory);
-  DarcyThermoMechApp::associateSyntax(_syntax, _action_factory);
-}
-
-void
-DarcyThermoMechApp::registerApps()
-{
-  registerApp(DarcyThermoMechApp);
-}
-
-void
-DarcyThermoMechApp::registerObjects(Factory & factory)
-{
-  registerKernel(DarcyPressure);
-  registerMaterial(PackedColumn);
-  registerAux(DarcyVelocity);
-  registerBoundaryCondition(HeatConductionOutflow);
-}
-
-void
-DarcyThermoMechApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
-{
-}
diff --git a/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C
new file mode 120000
index 000000000000..9e9fd062dfd9
--- /dev/null
+++ b/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step05_heat_conduction/src/bcs/HeatConductionOutflow.C b/tutorials/darcy_thermo_mech/step05_heat_conduction/src/bcs/HeatConductionOutflow.C
index 547efded2858..e0682e09f307 100644
--- a/tutorials/darcy_thermo_mech/step05_heat_conduction/src/bcs/HeatConductionOutflow.C
+++ b/tutorials/darcy_thermo_mech/step05_heat_conduction/src/bcs/HeatConductionOutflow.C
@@ -9,6 +9,8 @@
 
 #include "HeatConductionOutflow.h"
 
+registerMooseObject("DarcyThermoMechApp", HeatConductionOutflow);
+
 template <>
 InputParameters
 validParams<HeatConductionOutflow>()
diff --git a/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C
deleted file mode 100644
index ce011a0d649b..000000000000
--- a/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C
+++ /dev/null
@@ -1,62 +0,0 @@
-//* This file is part of the MOOSE framework
-//* https://www.mooseframework.org
-//*
-//* All rights reserved, see COPYRIGHT for full restrictions
-//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
-//*
-//* Licensed under LGPL 2.1, please see LICENSE for details
-//* https://www.gnu.org/licenses/lgpl-2.1.html
-
-// Tutorial Includes
-#include "DarcyThermoMechApp.h"
-#include "DarcyPressure.h"
-#include "DarcyConvection.h"
-#include "HeatConductionOutflow.h"
-#include "PackedColumn.h"
-#include "DarcyVelocity.h"
-
-// Moose Includes
-#include "AppFactory.h"
-#include "MooseSyntax.h"
-#include "ModulesApp.h"
-
-template <>
-InputParameters
-validParams<DarcyThermoMechApp>()
-{
-  InputParameters params = validParams<MooseApp>();
-  return params;
-}
-
-DarcyThermoMechApp::DarcyThermoMechApp(InputParameters parameters) : MooseApp(parameters)
-{
-  Moose::registerObjects(_factory);
-  ModulesApp::registerObjects(_factory);
-  DarcyThermoMechApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ModulesApp::associateSyntax(_syntax, _action_factory);
-  DarcyThermoMechApp::associateSyntax(_syntax, _action_factory);
-}
-
-void
-DarcyThermoMechApp::registerApps()
-{
-  registerApp(DarcyThermoMechApp);
-}
-
-void
-DarcyThermoMechApp::registerObjects(Factory & factory)
-{
-  registerKernel(DarcyPressure);
-  registerKernel(DarcyConvection);
-
-  registerMaterial(PackedColumn);
-  registerAux(DarcyVelocity);
-  registerBoundaryCondition(HeatConductionOutflow);
-}
-
-void
-DarcyThermoMechApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
-{
-}
diff --git a/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C
new file mode 120000
index 000000000000..9e9fd062dfd9
--- /dev/null
+++ b/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/kernels/DarcyConvection.C b/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/kernels/DarcyConvection.C
index 583249af9bb7..1ffd9fe4b593 100644
--- a/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/kernels/DarcyConvection.C
+++ b/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/kernels/DarcyConvection.C
@@ -9,6 +9,8 @@
 
 #include "DarcyConvection.h"
 
+registerMooseObject("DarcyThermoMechApp", DarcyConvection);
+
 template <>
 InputParameters
 validParams<DarcyConvection>()
diff --git a/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/materials/PackedColumn.C b/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/materials/PackedColumn.C
index 188eac37f54c..91faf0e745e2 100644
--- a/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/materials/PackedColumn.C
+++ b/tutorials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/materials/PackedColumn.C
@@ -9,6 +9,8 @@
 
 #include "PackedColumn.h"
 
+registerMooseObject("DarcyThermoMechApp", PackedColumn);
+
 template <>
 InputParameters
 validParams<PackedColumn>()
diff --git a/tutorials/darcy_thermo_mech/step07_adaptivity/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step07_adaptivity/src/base/DarcyThermoMechApp.C
index 7046e1bd6ffd..9e9fd062dfd9 120000
--- a/tutorials/darcy_thermo_mech/step07_adaptivity/src/base/DarcyThermoMechApp.C
+++ b/tutorials/darcy_thermo_mech/step07_adaptivity/src/base/DarcyThermoMechApp.C
@@ -1 +1 @@
-../../../step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C
\ No newline at end of file
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step08_postprocessors/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step08_postprocessors/src/base/DarcyThermoMechApp.C
index e4b8d9b17e2b..9e9fd062dfd9 120000
--- a/tutorials/darcy_thermo_mech/step08_postprocessors/src/base/DarcyThermoMechApp.C
+++ b/tutorials/darcy_thermo_mech/step08_postprocessors/src/base/DarcyThermoMechApp.C
@@ -1 +1 @@
-../../../step07_adaptivity/src/base/DarcyThermoMechApp.C
\ No newline at end of file
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step09_mechanics/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step09_mechanics/src/base/DarcyThermoMechApp.C
index 86a526d29540..9e9fd062dfd9 120000
--- a/tutorials/darcy_thermo_mech/step09_mechanics/src/base/DarcyThermoMechApp.C
+++ b/tutorials/darcy_thermo_mech/step09_mechanics/src/base/DarcyThermoMechApp.C
@@ -1 +1 @@
-../../../step08_postprocessors/src/base/DarcyThermoMechApp.C
\ No newline at end of file
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step10_multiapps/src/auxkernels/RandomCorrosion.C b/tutorials/darcy_thermo_mech/step10_multiapps/src/auxkernels/RandomCorrosion.C
index bc72c8b33397..71936e91652c 100644
--- a/tutorials/darcy_thermo_mech/step10_multiapps/src/auxkernels/RandomCorrosion.C
+++ b/tutorials/darcy_thermo_mech/step10_multiapps/src/auxkernels/RandomCorrosion.C
@@ -13,6 +13,8 @@
 
 #include "libmesh/mesh_tools.h"
 
+registerMooseObject("DarcyThermoMechApp", RandomCorrosion);
+
 template <>
 InputParameters
 validParams<RandomCorrosion>()
diff --git a/tutorials/darcy_thermo_mech/step10_multiapps/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step10_multiapps/src/base/DarcyThermoMechApp.C
deleted file mode 100644
index 41044fc95a4b..000000000000
--- a/tutorials/darcy_thermo_mech/step10_multiapps/src/base/DarcyThermoMechApp.C
+++ /dev/null
@@ -1,64 +0,0 @@
-//* This file is part of the MOOSE framework
-//* https://www.mooseframework.org
-//*
-//* All rights reserved, see COPYRIGHT for full restrictions
-//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
-//*
-//* Licensed under LGPL 2.1, please see LICENSE for details
-//* https://www.gnu.org/licenses/lgpl-2.1.html
-
-// Tutorial Includes
-#include "DarcyThermoMechApp.h"
-#include "DarcyPressure.h"
-#include "DarcyConvection.h"
-#include "HeatConductionOutflow.h"
-#include "PackedColumn.h"
-#include "DarcyVelocity.h"
-#include "RandomCorrosion.h"
-
-// Moose Includes
-#include "AppFactory.h"
-#include "MooseSyntax.h"
-#include "ModulesApp.h"
-
-template <>
-InputParameters
-validParams<DarcyThermoMechApp>()
-{
-  InputParameters params = validParams<MooseApp>();
-  return params;
-}
-
-DarcyThermoMechApp::DarcyThermoMechApp(InputParameters parameters) : MooseApp(parameters)
-{
-  Moose::registerObjects(_factory);
-  ModulesApp::registerObjects(_factory);
-  DarcyThermoMechApp::registerObjects(_factory);
-
-  Moose::associateSyntax(_syntax, _action_factory);
-  ModulesApp::associateSyntax(_syntax, _action_factory);
-  DarcyThermoMechApp::associateSyntax(_syntax, _action_factory);
-}
-
-void
-DarcyThermoMechApp::registerApps()
-{
-  registerApp(DarcyThermoMechApp);
-}
-
-void
-DarcyThermoMechApp::registerObjects(Factory & factory)
-{
-  registerKernel(DarcyPressure);
-  registerKernel(DarcyConvection);
-
-  registerMaterial(PackedColumn);
-  registerAux(DarcyVelocity);
-  registerAux(RandomCorrosion);
-  registerBoundaryCondition(HeatConductionOutflow);
-}
-
-void
-DarcyThermoMechApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
-{
-}
diff --git a/tutorials/darcy_thermo_mech/step10_multiapps/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step10_multiapps/src/base/DarcyThermoMechApp.C
new file mode 120000
index 000000000000..9e9fd062dfd9
--- /dev/null
+++ b/tutorials/darcy_thermo_mech/step10_multiapps/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
\ No newline at end of file
diff --git a/tutorials/darcy_thermo_mech/step10_multiapps/src/materials/PackedColumn.C b/tutorials/darcy_thermo_mech/step10_multiapps/src/materials/PackedColumn.C
index 12547bef9df4..d8bd85df062e 100644
--- a/tutorials/darcy_thermo_mech/step10_multiapps/src/materials/PackedColumn.C
+++ b/tutorials/darcy_thermo_mech/step10_multiapps/src/materials/PackedColumn.C
@@ -9,6 +9,8 @@
 
 #include "PackedColumn.h"
 
+registerMooseObject("DarcyThermoMechApp", PackedColumn);
+
 template <>
 InputParameters
 validParams<PackedColumn>()