diff --git a/src/cgpoisson_problem.cpp b/src/cgpoisson_problem.cpp
index d7bb807..0d46166 100644
--- a/src/cgpoisson_problem.cpp
+++ b/src/cgpoisson_problem.cpp
@@ -110,14 +110,14 @@ cgpoisson::problem(std::shared_ptr<mesh::Mesh<double>> mesh, int order,
       = {form_Poisson_M1, form_Poisson_M2, form_Poisson_M3};
 
   // Define variational forms
-  auto L = std::make_shared<fem::Form<T>>(fem::create_form<T>(
+  auto L = std::make_shared<fem::Form<T>>(fem::create_form_factory<T>(
       *form_poisson_L.at(order - 1), {V}, {{"w0", f}, {"w1", g}}, {}, {}));
   // auto a = std::make_shared<fem::Form<T>>(fem::create_form<T>(
   //     *form_poisson_a.at(order - 1), {V, V},
   //     std::vector<std::shared_ptr<const fem::Function<T>>>{}, {}, {}));
 
   auto un = std::make_shared<fem::Function<T>>(V);
-  auto M = std::make_shared<fem::Form<T>>(fem::create_form<T>(
+  auto M = std::make_shared<fem::Form<T>>(fem::create_form_factory<T>(
       *form_poisson_M.at(order - 1), {V}, {{"w0", un}}, {{}}, {}));
 
   // Create la::Vector
diff --git a/src/elasticity_problem.cpp b/src/elasticity_problem.cpp
index e8f9cf7..ec70ff2 100644
--- a/src/elasticity_problem.cpp
+++ b/src/elasticity_problem.cpp
@@ -178,9 +178,9 @@ elastic::problem(std::shared_ptr<mesh::Mesh<double>> mesh, int order)
       = {form_Elasticity_L1, form_Elasticity_L2, form_Elasticity_L3};
   std::vector form_elasticity_a
       = {form_Elasticity_a1, form_Elasticity_a2, form_Elasticity_a3};
-  auto L = std::make_shared<fem::Form<T, double>>(fem::create_form<T>(
+  auto L = std::make_shared<fem::Form<T, double>>(fem::create_form_factory<T>(
       *form_elasticity_L.at(order - 1), {V}, {{"w0", f}}, {}, {}));
-  auto a = std::make_shared<fem::Form<T, double>>(fem::create_form<T>(
+  auto a = std::make_shared<fem::Form<T, double>>(fem::create_form_factory<T>(
       *form_elasticity_a.at(order - 1), {V, V},
       std::vector<std::shared_ptr<const fem::Function<T>>>{}, {}, {}));
   t0c.stop();
diff --git a/src/poisson_problem.cpp b/src/poisson_problem.cpp
index 923c05e..8fcf791 100644
--- a/src/poisson_problem.cpp
+++ b/src/poisson_problem.cpp
@@ -105,9 +105,9 @@ poisson::problem(std::shared_ptr<mesh::Mesh<double>> mesh, int order)
       = {form_Poisson_a1, form_Poisson_a2, form_Poisson_a3};
 
   // Define variational forms
-  auto L = std::make_shared<fem::Form<T>>(fem::create_form<T>(
+  auto L = std::make_shared<fem::Form<T>>(fem::create_form_factory<T>(
       *form_poisson_L.at(order - 1), {V}, {{"w0", f}, {"w1", g}}, {}, {}));
-  auto a = std::make_shared<fem::Form<T>>(fem::create_form<T>(
+  auto a = std::make_shared<fem::Form<T>>(fem::create_form_factory<T>(
       *form_poisson_a.at(order - 1), {V, V},
       std::vector<std::shared_ptr<const fem::Function<T>>>{}, {}, {}));