diff --git a/include/aspect/boundary_composition/interface.h b/include/aspect/boundary_composition/interface.h
index 72aa2c42f0c..79b3da1744f 100644
--- a/include/aspect/boundary_composition/interface.h
+++ b/include/aspect/boundary_composition/interface.h
@@ -158,9 +158,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename BoundaryCompositionType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,BoundaryCompositionType>::value>>
+        DEAL_II_DEPRECATED
         bool
         has_matching_boundary_composition_model () const;
 
@@ -174,9 +180,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename BoundaryCompositionType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,BoundaryCompositionType>::value>>
+        DEAL_II_DEPRECATED
         const BoundaryCompositionType &
         get_matching_boundary_composition_model () const;
 
diff --git a/include/aspect/boundary_temperature/interface.h b/include/aspect/boundary_temperature/interface.h
index 3359ed09254..898a72fad85 100644
--- a/include/aspect/boundary_temperature/interface.h
+++ b/include/aspect/boundary_temperature/interface.h
@@ -192,9 +192,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename BoundaryTemperatureType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,BoundaryTemperatureType>::value>>
+        DEAL_II_DEPRECATED
         bool
         has_matching_boundary_temperature_model () const;
 
@@ -208,9 +214,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename BoundaryTemperatureType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,BoundaryTemperatureType>::value>>
+        DEAL_II_DEPRECATED
         const BoundaryTemperatureType &
         get_matching_boundary_temperature_model () const;
 
diff --git a/include/aspect/heating_model/interface.h b/include/aspect/heating_model/interface.h
index d40d83d0ec9..f51073ca06a 100644
--- a/include/aspect/heating_model/interface.h
+++ b/include/aspect/heating_model/interface.h
@@ -273,9 +273,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename HeatingModelType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,HeatingModelType>::value>>
+        DEAL_II_DEPRECATED
         bool
         has_matching_heating_model () const;
 
@@ -289,9 +295,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename HeatingModelType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,HeatingModelType>::value>>
+        DEAL_II_DEPRECATED
         const HeatingModelType &
         get_matching_heating_model () const;
 
diff --git a/include/aspect/initial_composition/interface.h b/include/aspect/initial_composition/interface.h
index 57e00e38d53..adba4d40bb6 100644
--- a/include/aspect/initial_composition/interface.h
+++ b/include/aspect/initial_composition/interface.h
@@ -147,9 +147,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename InitialCompositionType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,InitialCompositionType>::value>>
+        DEAL_II_DEPRECATED
         bool
         has_matching_initial_composition_model () const;
 
@@ -163,9 +169,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename InitialCompositionType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,InitialCompositionType>::value>>
+        DEAL_II_DEPRECATED
         const InitialCompositionType &
         get_matching_initial_composition_model () const;
 
diff --git a/include/aspect/initial_temperature/interface.h b/include/aspect/initial_temperature/interface.h
index dea8e451aaf..ed365534877 100644
--- a/include/aspect/initial_temperature/interface.h
+++ b/include/aspect/initial_temperature/interface.h
@@ -144,9 +144,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename InitialTemperatureType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,InitialTemperatureType>::value>>
+        DEAL_II_DEPRECATED
         bool
         has_matching_initial_temperature_model () const;
 
@@ -160,9 +166,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename InitialTemperatureType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,InitialTemperatureType>::value>>
+        DEAL_II_DEPRECATED
         const InitialTemperatureType &
         get_matching_initial_temperature_model () const;
 
diff --git a/include/aspect/mesh_refinement/interface.h b/include/aspect/mesh_refinement/interface.h
index 01f348deab2..e5b8516ba03 100644
--- a/include/aspect/mesh_refinement/interface.h
+++ b/include/aspect/mesh_refinement/interface.h
@@ -160,9 +160,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename MeshRefinementType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,MeshRefinementType>::value>>
+        DEAL_II_DEPRECATED
         bool
         has_matching_mesh_refinement_strategy () const;
 
@@ -176,9 +182,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename MeshRefinementType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,MeshRefinementType>::value>>
+        DEAL_II_DEPRECATED
         const MeshRefinementType &
         get_matching_mesh_refinement_strategy () const;
 
diff --git a/include/aspect/particle/property/interface.h b/include/aspect/particle/property/interface.h
index e59ec79228a..bbe48d0bb4e 100644
--- a/include/aspect/particle/property/interface.h
+++ b/include/aspect/particle/property/interface.h
@@ -614,9 +614,15 @@ namespace aspect
            *
            * This function can only be called if the given template type (the first template
            * argument) is a class derived from the Interface class in this namespace.
+           *
+           * @deprecated Instead of this function, use the
+           *   Plugins::ManagerBase::has_matching_plugin_object() and
+           *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+           *   class of the current class.
            */
           template <typename ParticlePropertyType,
                     typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,ParticlePropertyType>::value>>
+          DEAL_II_DEPRECATED
           bool
           has_matching_property () const;
 
@@ -630,9 +636,15 @@ namespace aspect
            *
            * This function can only be called if the given template type (the first template
            * argument) is a class derived from the Interface class in this namespace.
+           *
+           * @deprecated Instead of this function, use the
+           *   Plugins::ManagerBase::has_matching_plugin_object() and
+           *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+           *   class of the current class.
            */
           template <typename ParticlePropertyType,
                     typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,ParticlePropertyType>::value>>
+          DEAL_II_DEPRECATED
           const ParticlePropertyType &
           get_matching_property () const;
 
diff --git a/include/aspect/postprocess/interface.h b/include/aspect/postprocess/interface.h
index 623d4facf62..215860eab66 100644
--- a/include/aspect/postprocess/interface.h
+++ b/include/aspect/postprocess/interface.h
@@ -110,8 +110,9 @@ namespace aspect
          * of course needs to be able to access these other postprocessors.
          * This can be done by deriving your postprocessor from
          * SimulatorAccess, and then using the
-         * SimulatorAccess::get_postprocess_manager::get_matching_postprocessor
-         * function.
+         * SimulatorAccess::get_postprocess_manager() function, followed
+         * by asking the resulting object via get_matching_plugin_object()
+         * for a specific postprocessor object.
          */
         virtual
         std::list<std::string>
@@ -193,9 +194,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename PostprocessorType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,PostprocessorType>::value>>
+        DEAL_II_DEPRECATED
         bool
         has_matching_postprocessor () const;
 
@@ -209,9 +216,15 @@ namespace aspect
          *
          * This function can only be called if the given template type (the first template
          * argument) is a class derived from the Interface class in this namespace.
+         *
+         * @deprecated Instead of this function, use the
+         *   Plugins::ManagerBase::has_matching_plugin_object() and
+         *   Plugins::ManagerBase::get_matching_plugin_object() functions of the base
+         *   class of the current class.
          */
         template <typename PostprocessorType,
                   typename = typename std::enable_if_t<std::is_base_of<Interface<dim>,PostprocessorType>::value>>
+        DEAL_II_DEPRECATED
         const PostprocessorType &
         get_matching_postprocessor () const;
 
diff --git a/source/boundary_temperature/dynamic_core.cc b/source/boundary_temperature/dynamic_core.cc
index f38bbbae653..407582b9418 100644
--- a/source/boundary_temperature/dynamic_core.cc
+++ b/source/boundary_temperature/dynamic_core.cc
@@ -594,11 +594,11 @@ namespace aspect
       // It is not available at the time initialize() function of boundary temperature is called.
       if (is_first_call==true)
         {
-          AssertThrow(this->get_postprocess_manager().template has_matching_postprocessor<const Postprocess::CoreStatistics<dim>>(),
+          AssertThrow(this->get_postprocess_manager().template has_matching_plugin_object<const Postprocess::CoreStatistics<dim>>(),
                       ExcMessage ("Dynamic core boundary condition has to work with dynamic core statistics postprocessor."));
 
           const Postprocess::CoreStatistics<dim> &core_statistics
-            = this->get_postprocess_manager().template get_matching_postprocessor<const Postprocess::CoreStatistics<dim>>();
+            = this->get_postprocess_manager().template get_matching_plugin_object<const Postprocess::CoreStatistics<dim>>();
           // The restart data is stored in 'core statistics' postprocessor.
           // If restart from checkpoint, extract data from there.
           core_data = core_statistics.get_core_data();
diff --git a/source/heating_model/interface.cc b/source/heating_model/interface.cc
index ac0fff5b29e..61d49d06e96 100644
--- a/source/heating_model/interface.cc
+++ b/source/heating_model/interface.cc
@@ -59,7 +59,7 @@ namespace aspect
     bool
     Manager<dim>::adiabatic_heating_enabled() const
     {
-      return has_matching_heating_model<HeatingModel::AdiabaticHeating<dim>>() ;
+      return this->template has_matching_plugin_object<HeatingModel::AdiabaticHeating<dim>>() ;
     }
 
 
@@ -68,7 +68,7 @@ namespace aspect
     bool
     Manager<dim>::shear_heating_enabled() const
     {
-      return has_matching_heating_model<HeatingModel::ShearHeating<dim>>() ;
+      return this->template has_matching_plugin_object<HeatingModel::ShearHeating<dim>>() ;
     }
 
 
diff --git a/source/particle/property/cpo_bingham_average.cc b/source/particle/property/cpo_bingham_average.cc
index eecfba3634a..6ea083b35a1 100644
--- a/source/particle/property/cpo_bingham_average.cc
+++ b/source/particle/property/cpo_bingham_average.cc
@@ -252,7 +252,7 @@ namespace aspect
         {
           // Get a pointer to the CPO particle property.
           cpo_particle_property = std::make_unique<const Particle::Property::CrystalPreferredOrientation<dim>> (
-                                    this->get_particle_world(this->get_particle_world_index()).get_property_manager().template get_matching_property<Particle::Property::CrystalPreferredOrientation<dim>>());
+                                    this->get_particle_world(this->get_particle_world_index()).get_property_manager().template get_matching_plugin_object<Particle::Property::CrystalPreferredOrientation<dim>>());
 
           random_number_seed = prm.get_integer ("Random number seed");
           n_grains = cpo_particle_property->get_number_of_grains();
diff --git a/source/particle/property/cpo_elastic_tensor.cc b/source/particle/property/cpo_elastic_tensor.cc
index e15c4436b70..8a5f71559e4 100644
--- a/source/particle/property/cpo_elastic_tensor.cc
+++ b/source/particle/property/cpo_elastic_tensor.cc
@@ -147,7 +147,7 @@ namespace aspect
       {
         // Get a reference to the CPO particle property.
         const Particle::Property::CrystalPreferredOrientation<dim> &cpo_particle_property =
-          this->get_particle_world(this->get_particle_world_index()).get_property_manager().template get_matching_property<Particle::Property::CrystalPreferredOrientation<dim>>();
+          this->get_particle_world(this->get_particle_world_index()).get_property_manager().template get_matching_plugin_object<Particle::Property::CrystalPreferredOrientation<dim>>();
 
 
         const SymmetricTensor<2,6> C_average = voigt_average_elastic_tensor(cpo_particle_property,
diff --git a/source/postprocess/core_statistics.cc b/source/postprocess/core_statistics.cc
index 1179c83a4ff..7833b682b71 100644
--- a/source/postprocess/core_statistics.cc
+++ b/source/postprocess/core_statistics.cc
@@ -47,7 +47,7 @@ namespace aspect
       std::ostringstream screen_text;
 
       const BoundaryTemperature::DynamicCore<dim> &dynamic_core =
-        this->get_boundary_temperature_manager().template get_matching_boundary_temperature_model<BoundaryTemperature::DynamicCore<dim>>();
+        this->get_boundary_temperature_manager().template get_matching_plugin_object<BoundaryTemperature::DynamicCore<dim>>();
 
       core_data = dynamic_core.get_core_data();
 
diff --git a/source/postprocess/crystal_preferred_orientation.cc b/source/postprocess/crystal_preferred_orientation.cc
index 974ffa07e79..0b5e19c1b15 100644
--- a/source/postprocess/crystal_preferred_orientation.cc
+++ b/source/postprocess/crystal_preferred_orientation.cc
@@ -180,7 +180,7 @@ namespace aspect
 
       // Get a reference to the CPO particle property.
       const Particle::Property::CrystalPreferredOrientation<dim> &cpo_particle_property =
-        manager.template get_matching_property<Particle::Property::CrystalPreferredOrientation<dim>>();
+        manager.template get_matching_plugin_object<Particle::Property::CrystalPreferredOrientation<dim>>();
 
       const unsigned int n_grains = cpo_particle_property.get_number_of_grains();
       const unsigned int n_minerals = cpo_particle_property.get_number_of_minerals();
diff --git a/source/postprocess/dynamic_topography.cc b/source/postprocess/dynamic_topography.cc
index 8751c8f9463..5175e8c9c4b 100644
--- a/source/postprocess/dynamic_topography.cc
+++ b/source/postprocess/dynamic_topography.cc
@@ -35,7 +35,7 @@ namespace aspect
     DynamicTopography<dim>::execute (TableHandler &)
     {
       const Postprocess::BoundaryPressures<dim> &boundary_pressures =
-        this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::BoundaryPressures<dim>>();
+        this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::BoundaryPressures<dim>>();
 
       // Get the average pressure at the top and bottom boundaries.
       // This will be used to compute the dynamic pressure at the boundaries.
diff --git a/source/postprocess/geoid.cc b/source/postprocess/geoid.cc
index 96789262ce4..beadb4ba0fd 100644
--- a/source/postprocess/geoid.cc
+++ b/source/postprocess/geoid.cc
@@ -182,7 +182,7 @@ namespace aspect
     {
       // Get a pointer to the boundary densities postprocessor.
       const Postprocess::BoundaryDensities<3> &boundary_densities =
-        this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::BoundaryDensities<3>>();
+        this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::BoundaryDensities<3>>();
 
       const double top_layer_average_density = boundary_densities.density_at_top();
       const double bottom_layer_average_density = boundary_densities.density_at_bottom();
@@ -270,7 +270,7 @@ namespace aspect
                       {
                         // Get a reference to the dynamic topography postprocessor.
                         const Postprocess::DynamicTopography<3> &dynamic_topography =
-                          this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::DynamicTopography<3>>();
+                          this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::DynamicTopography<3>>();
 
                         // Get the already-computed dynamic topography solution.
                         const LinearAlgebra::BlockVector &topo_vector = dynamic_topography.topography_vector();
@@ -317,7 +317,7 @@ namespace aspect
                       {
                         // Get a reference to the dynamic topography postprocessor.
                         const Postprocess::DynamicTopography<3> &dynamic_topography =
-                          this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::DynamicTopography<3>>();
+                          this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::DynamicTopography<3>>();
 
                         // Get the already-computed dynamic topography solution.
                         const LinearAlgebra::BlockVector &topo_vector = dynamic_topography.topography_vector();
diff --git a/source/postprocess/sea_level.cc b/source/postprocess/sea_level.cc
index 4f95c70f2a2..33cb7418e9e 100644
--- a/source/postprocess/sea_level.cc
+++ b/source/postprocess/sea_level.cc
@@ -84,7 +84,7 @@ namespace aspect
       const int dim = 3;
 
       const Postprocess::Geoid<dim> &geoid =
-        this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Geoid<dim>>();
+        this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Geoid<dim>>();
 
       const double geoid_displacement = geoid.evaluate(position); // TODO: check sign of geoid_displacement
       const double topography = this->get_geometry_model().height_above_reference_surface(position);
@@ -125,7 +125,7 @@ namespace aspect
       const types::boundary_id top_boundary_id = this->get_geometry_model().translate_symbolic_boundary_name_to_id("top");
 
       const Postprocess::Geoid<dim> &geoid =
-        this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Geoid<dim>>();
+        this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Geoid<dim>>();
 
       const unsigned int quadrature_degree = this->introspection().polynomial_degree.temperature;
       const QGauss<dim-1> quadrature_formula_face(quadrature_degree);
@@ -266,7 +266,7 @@ namespace aspect
       const types::boundary_id top_boundary_id = this->get_geometry_model().translate_symbolic_boundary_name_to_id("top");
 
       const Postprocess::Geoid<dim> &geoid =
-        this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Geoid<dim>>();
+        this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Geoid<dim>>();
 
       // Get the sea level offset (constant for every location).
       sea_level_offset = compute_sea_level_offset();
diff --git a/source/postprocess/visualization/boundary_strain_rate_residual.cc b/source/postprocess/visualization/boundary_strain_rate_residual.cc
index 657cd5d8ac1..5cbf716e59b 100644
--- a/source/postprocess/visualization/boundary_strain_rate_residual.cc
+++ b/source/postprocess/visualization/boundary_strain_rate_residual.cc
@@ -73,7 +73,7 @@ namespace aspect
         const double unit_scaling_factor = this->convert_output_to_years() ? year_in_seconds : 1.0;
 
         const Postprocess::BoundaryStrainRateResidualStatistics<dim> &boundary_strain_rate_residual_statistics =
-          this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::BoundaryStrainRateResidualStatistics<dim>>();
+          this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::BoundaryStrainRateResidualStatistics<dim>>();
 
         // We only want the output at the top boundary, so only compute it if the current cell
         // has a face at the top boundary.
@@ -106,7 +106,7 @@ namespace aspect
 
             }
 
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
 
diff --git a/source/postprocess/visualization/boundary_velocity_residual.cc b/source/postprocess/visualization/boundary_velocity_residual.cc
index 65d3c194cbf..8630c0f4b92 100644
--- a/source/postprocess/visualization/boundary_velocity_residual.cc
+++ b/source/postprocess/visualization/boundary_velocity_residual.cc
@@ -68,7 +68,7 @@ namespace aspect
           this->convert_output_to_years() ? year_in_seconds : 1.0;
 
         const Postprocess::BoundaryVelocityResidualStatistics<dim> &boundary_velocity_residual_statistics =
-          this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::BoundaryVelocityResidualStatistics<dim>>();
+          this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::BoundaryVelocityResidualStatistics<dim>>();
 
         // We only want the output at the top boundary, so only compute it if the current cell
         // has a face at the top boundary.
diff --git a/source/postprocess/visualization/dynamic_topography.cc b/source/postprocess/visualization/dynamic_topography.cc
index 01817ddd267..64f75539936 100644
--- a/source/postprocess/visualization/dynamic_topography.cc
+++ b/source/postprocess/visualization/dynamic_topography.cc
@@ -50,7 +50,7 @@ namespace aspect
           quantity(0) = 0;
 
         const Postprocess::DynamicTopography<dim> &dynamic_topography =
-          this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::DynamicTopography<dim>>();
+          this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::DynamicTopography<dim>>();
 
         auto cell = input_data.template get_cell<dim>();
 
diff --git a/source/postprocess/visualization/geoid.cc b/source/postprocess/visualization/geoid.cc
index d7af2b2fafc..de57c0cf9f8 100644
--- a/source/postprocess/visualization/geoid.cc
+++ b/source/postprocess/visualization/geoid.cc
@@ -68,7 +68,7 @@ namespace aspect
           quantity(0) = 0;
 
         const Postprocess::Geoid<dim> &geoid =
-          this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Geoid<dim>>();
+          this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Geoid<dim>>();
 
         auto cell = input_data.template get_cell<dim>();
 
diff --git a/source/postprocess/visualization/shear_stress.cc b/source/postprocess/visualization/shear_stress.cc
index 49f0f54ce42..c5703878535 100644
--- a/source/postprocess/visualization/shear_stress.cc
+++ b/source/postprocess/visualization/shear_stress.cc
@@ -111,7 +111,7 @@ namespace aspect
           }
 
         // average the values if requested
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
       }
diff --git a/source/postprocess/visualization/strain_rate.cc b/source/postprocess/visualization/strain_rate.cc
index a50e49e8c1c..c3b2df71637 100644
--- a/source/postprocess/visualization/strain_rate.cc
+++ b/source/postprocess/visualization/strain_rate.cc
@@ -65,7 +65,7 @@ namespace aspect
           }
 
         // average the values if requested
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
       }
diff --git a/source/postprocess/visualization/strain_rate_tensor.cc b/source/postprocess/visualization/strain_rate_tensor.cc
index a68de211733..4d6de65742c 100644
--- a/source/postprocess/visualization/strain_rate_tensor.cc
+++ b/source/postprocess/visualization/strain_rate_tensor.cc
@@ -71,7 +71,7 @@ namespace aspect
                   = deviatoric_strain_rate[d][e];
           }
 
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
 
diff --git a/source/postprocess/visualization/stress.cc b/source/postprocess/visualization/stress.cc
index d4016b866d3..78668b61326 100644
--- a/source/postprocess/visualization/stress.cc
+++ b/source/postprocess/visualization/stress.cc
@@ -111,7 +111,7 @@ namespace aspect
           }
 
         // average the values if requested
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
       }
diff --git a/source/postprocess/visualization/stress_second_invariant.cc b/source/postprocess/visualization/stress_second_invariant.cc
index 1b2f4c87b6f..0d6228ef57b 100644
--- a/source/postprocess/visualization/stress_second_invariant.cc
+++ b/source/postprocess/visualization/stress_second_invariant.cc
@@ -109,7 +109,7 @@ namespace aspect
           }
 
         // average the values if requested
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
       }
diff --git a/source/postprocess/visualization/surface_dynamic_topography.cc b/source/postprocess/visualization/surface_dynamic_topography.cc
index 8b18c62e0ad..45eddfe69d4 100644
--- a/source/postprocess/visualization/surface_dynamic_topography.cc
+++ b/source/postprocess/visualization/surface_dynamic_topography.cc
@@ -50,7 +50,7 @@ namespace aspect
           quantity(0) = 0;
 
         const Postprocess::DynamicTopography<dim> &dynamic_topography =
-          this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::DynamicTopography<dim>>();
+          this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::DynamicTopography<dim>>();
 
         auto cell = input_data.template get_cell<dim>();
 
diff --git a/source/postprocess/visualization/surface_strain_rate_tensor.cc b/source/postprocess/visualization/surface_strain_rate_tensor.cc
index 6dd8b5c02ef..c130d808455 100644
--- a/source/postprocess/visualization/surface_strain_rate_tensor.cc
+++ b/source/postprocess/visualization/surface_strain_rate_tensor.cc
@@ -72,7 +72,7 @@ namespace aspect
           }
 
         // average the values if requested
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
 
diff --git a/source/postprocess/visualization/surface_stress.cc b/source/postprocess/visualization/surface_stress.cc
index f1dea24cc0f..e88bf50e68a 100644
--- a/source/postprocess/visualization/surface_stress.cc
+++ b/source/postprocess/visualization/surface_stress.cc
@@ -103,7 +103,7 @@ namespace aspect
           }
 
         // average the values if requested
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
       }
diff --git a/source/postprocess/visualization/volumetric_strain_rate.cc b/source/postprocess/visualization/volumetric_strain_rate.cc
index 3c5c6273238..1f07eaac412 100644
--- a/source/postprocess/visualization/volumetric_strain_rate.cc
+++ b/source/postprocess/visualization/volumetric_strain_rate.cc
@@ -62,7 +62,7 @@ namespace aspect
           }
 
         // average the values if requested
-        const auto &viz = this->get_postprocess_manager().template get_matching_postprocessor<Postprocess::Visualization<dim>>();
+        const auto &viz = this->get_postprocess_manager().template get_matching_plugin_object<Postprocess::Visualization<dim>>();
         if (!viz.output_pointwise_stress_and_strain())
           average_quantities(computed_quantities);
       }
diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index d74c564d1ea..bc7f4eefe18 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -446,7 +446,7 @@ namespace aspect
     postprocess_manager.initialize_simulator (*this);
     postprocess_manager.parse_parameters (prm);
 
-    if (postprocess_manager.template has_matching_postprocessor<Postprocess::Particles<dim>>())
+    if (postprocess_manager.template has_matching_plugin_object<Postprocess::Particles<dim>>())
       {
         particle_worlds.emplace_back(std::move(std::make_unique<Particle::World<dim>>()));
         for (unsigned int particle_world_index = 0 ; particle_world_index < particle_worlds.size(); ++particle_world_index)
diff --git a/source/simulator/helper_functions.cc b/source/simulator/helper_functions.cc
index 0450a1de14d..c769f96f0ed 100644
--- a/source/simulator/helper_functions.cc
+++ b/source/simulator/helper_functions.cc
@@ -2242,7 +2242,7 @@ namespace aspect
                                "Please check the consistency of your input file."));
 
         const bool use_simplified_adiabatic_heating =
-          heating_model_manager.template get_matching_heating_model<HeatingModel::AdiabaticHeating<dim>>()
+          heating_model_manager.template get_matching_plugin_object<HeatingModel::AdiabaticHeating<dim>>()
           .use_simplified_adiabatic_heating();
 
         AssertThrow(use_simplified_adiabatic_heating == true,
diff --git a/source/volume_of_fluid/handler.cc b/source/volume_of_fluid/handler.cc
index 42f4b1698d4..37067bcfcf8 100644
--- a/source/volume_of_fluid/handler.cc
+++ b/source/volume_of_fluid/handler.cc
@@ -427,7 +427,7 @@ namespace aspect
     if ( this->get_parameters().initial_adaptive_refinement > 0 ||
          this->get_parameters().adaptive_refinement_interval > 0 )
       {
-        AssertThrow(this->get_mesh_refinement_manager().template has_matching_mesh_refinement_strategy<MeshRefinement::VolumeOfFluidInterface<dim>>(),
+        AssertThrow(this->get_mesh_refinement_manager().template has_matching_plugin_object<MeshRefinement::VolumeOfFluidInterface<dim>>(),
                     ExcMessage("Volume of Fluid Interface Tracking requires that the 'volume of fluid interface' strategy be used for AMR"));
 
         AssertThrow(this->get_parameters().adaptive_refinement_interval <(1/this->get_parameters().CFL_number),