diff --git a/applications/knl/poisson_dg/knl_poisson_dg.mini b/applications/knl/poisson_dg/knl_poisson_dg.mini
index c21fac6616e3ba010278ca18c8ab6230bd3b5d29..0d8380d821b204d3b122c648a08943f24488fb48 100644
--- a/applications/knl/poisson_dg/knl_poisson_dg.mini
+++ b/applications/knl/poisson_dg/knl_poisson_dg.mini
@@ -38,7 +38,7 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
+vectorization_quadloop = 1
 vectorize_diagonal = 1
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
diff --git a/applications/knl/poisson_dg/verify.mini b/applications/knl/poisson_dg/verify.mini
index bae219fc0b2336b1109b109b8c236e9e8ef9cc5c..07c5074b1d780074763605d29a12934d69a8a99f 100644
--- a/applications/knl/poisson_dg/verify.mini
+++ b/applications/knl/poisson_dg/verify.mini
@@ -11,7 +11,7 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
+vectorization_quadloop = 1
 vectorize_diagonal = 1
 quadrature_order = 6
 architecture = knl
diff --git a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini
index 667615fb6b9915b06f9bafca64cb113efc59e611..95c6368f7add85f69a432635438da01a037ff490 100644
--- a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini
+++ b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini
@@ -38,7 +38,7 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
+vectorization_quadloop = 1
 vectorize_diagonal = 1
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
diff --git a/applications/knl/poisson_dg_tensor/verify.mini b/applications/knl/poisson_dg_tensor/verify.mini
index 2f0d7170f89fccc6c4e65888f8cdab176c2dd015..029acbe57eae0a7bb0b2291ce5906369f45fb55e 100644
--- a/applications/knl/poisson_dg_tensor/verify.mini
+++ b/applications/knl/poisson_dg_tensor/verify.mini
@@ -11,7 +11,7 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
+vectorization_quadloop = 1
 vectorize_diagonal = 1
 quadrature_order = 6
 architecture = knl
diff --git a/applications/poisson_dg/poisson_dg.mini b/applications/poisson_dg/poisson_dg.mini
index 1c5a57f37003ca4b2ca480c8a1097b8cfca4ff51..2ba1c2cd1b9392990ef4022cd43095ec5ffb489b 100644
--- a/applications/poisson_dg/poisson_dg.mini
+++ b/applications/poisson_dg/poisson_dg.mini
@@ -38,7 +38,7 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
+vectorization_quadloop = 1
 vectorize_greedy = 1
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
diff --git a/applications/poisson_dg/verify.mini b/applications/poisson_dg/verify.mini
index 90c5885e3a86199ec64cdf97e9ee3d3362350521..a2eed15308793b163781a9ecba590cd31c4f7400 100644
--- a/applications/poisson_dg/verify.mini
+++ b/applications/poisson_dg/verify.mini
@@ -11,8 +11,8 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
-vectorize_grads = 1
+vectorization_quadloop = 1
+vectorization_strategy = explicit
 exact_solution_expression = g
 compare_l2errorsquared = 1e-6
 
diff --git a/applications/poisson_dg_tensor/poisson_dg_tensor.mini b/applications/poisson_dg_tensor/poisson_dg_tensor.mini
index 853653a162308b1e96e71e465819e47df6062d8f..d0c7251aad61e024213e3a8215c4ae48f083c5a6 100644
--- a/applications/poisson_dg_tensor/poisson_dg_tensor.mini
+++ b/applications/poisson_dg_tensor/poisson_dg_tensor.mini
@@ -38,7 +38,7 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
+vectorization_quadloop = 1
 vectorize_greedy = 1
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
diff --git a/applications/poisson_dg_tensor/sliced/sliced.mini b/applications/poisson_dg_tensor/sliced/sliced.mini
index dee4de55259c6f5d6765c5d214d54ec42e58b2c1..7522320ab62cf52fc5af6bb4225363735c675122 100644
--- a/applications/poisson_dg_tensor/sliced/sliced.mini
+++ b/applications/poisson_dg_tensor/sliced/sliced.mini
@@ -37,7 +37,7 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
+vectorization_quadloop = 1
 vectorize_slice = 1
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
diff --git a/applications/poisson_dg_tensor/verify.mini b/applications/poisson_dg_tensor/verify.mini
index b1f4672e5ca10c6f1873392a6b5033eaff0a52b4..774b5e1b9c033c519c19bb35b8deb5db0efd58aa 100644
--- a/applications/poisson_dg_tensor/verify.mini
+++ b/applications/poisson_dg_tensor/verify.mini
@@ -11,8 +11,8 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
-vectorize_grads = 1
+vectorization_quadloop = 1
+vectorization_strategy = explicit
 compare_l2errorsquared = 1e-6
 
 [formcompiler.ufl_variants]
diff --git a/applications/stokes_dg/stokes_dg.mini b/applications/stokes_dg/stokes_dg.mini
index 2e7dc52aa0d227de1b83df02c7395ac4707dd34e..2727253b46dc9a0bcbe9f23116461dd896cff9ac 100644
--- a/applications/stokes_dg/stokes_dg.mini
+++ b/applications/stokes_dg/stokes_dg.mini
@@ -39,7 +39,7 @@ extension = vtu
 [formcompiler]
 fastdg = 1
 sumfact = 1
-vectorize_quad = 1
+vectorization_quadloop = 1
 vectorize_greedy = 1
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
diff --git a/test/sumfact/mass/mass.mini b/test/sumfact/mass/mass.mini
index 86b003013d547ec81b9059b2adb08dc3eb34aa4a..44870439291a6111c18353f2c80e9be2116d3b28 100644
--- a/test/sumfact/mass/mass.mini
+++ b/test/sumfact/mass/mass.mini
@@ -14,5 +14,5 @@ extension = vtu
 
 [formcompiler]
 numerical_jacobian = 1, 0 | expand num
-vectorize_quad = 1, 0 | expand vec
+vectorization_quadloop = 1, 0 | expand vec
 sumfact = 1
diff --git a/test/sumfact/mass/mass_3d.mini b/test/sumfact/mass/mass_3d.mini
index 77626456b6fc4beccd42e734b9fec42b89776041..aba93533768a7b5463052c6585f6e45648380b70 100644
--- a/test/sumfact/mass/mass_3d.mini
+++ b/test/sumfact/mass/mass_3d.mini
@@ -15,7 +15,7 @@ extension = vtu
 
 [formcompiler]
 numerical_jacobian = 1, 0 | expand num
-vectorize_quad = 1, 0 | expand vec
+vectorization_quadloop = 1, 0 | expand vec
 sumfact = 1
 
 [formcompiler.ufl_variants]
diff --git a/test/sumfact/poisson/diagonal.mini b/test/sumfact/poisson/diagonal.mini
index bcbab188a4c7ada55c7077c10d7399406705fc77..d2687d6469fc7a67913754f1ee91c72641909539 100644
--- a/test/sumfact/poisson/diagonal.mini
+++ b/test/sumfact/poisson/diagonal.mini
@@ -10,8 +10,7 @@ extension = vtu
 [formcompiler]
 sumfact = 1
 compare_l2errorsquared = 1e-5
-vectorize_quad = 1
-vectorize_grads = 0
+vectorization_quadloop = 1
 vectorize_diagonal = 1
 quadrature_order = 6, 6, 6
 fastdg = 1
diff --git a/test/sumfact/poisson/poisson_2d.mini b/test/sumfact/poisson/poisson_2d.mini
index 129c2ff373937cd9fecd86dcdf38b78723fee339..9fab490cf7b12a362767520975173927971e2382 100644
--- a/test/sumfact/poisson/poisson_2d.mini
+++ b/test/sumfact/poisson/poisson_2d.mini
@@ -17,7 +17,7 @@ extension = vtu
 numerical_jacobian = 1, 0 | expand num
 compare_l2errorsquared = 4e-5, 4e-9 | expand deg
 sumfact = 1
-vectorize_grads = 1, 0 | expand grad
+vectorization_strategy = explicit, none | expand grad
 quadrature_order = 2, 4
 
 [formcompiler.ufl_variants]
diff --git a/test/sumfact/poisson/poisson_3d.mini b/test/sumfact/poisson/poisson_3d.mini
index a8b2a96bf871d623b672c6bb5ccb3ec87b980f52..2ddbd626bac79456c3b138e0386a8ac94ee9aa15 100644
--- a/test/sumfact/poisson/poisson_3d.mini
+++ b/test/sumfact/poisson/poisson_3d.mini
@@ -18,8 +18,8 @@ extension = vtu
 numerical_jacobian = 1, 0 | expand num
 compare_l2errorsquared = 1e-4, 1e-8 | expand deg
 sumfact = 1
-vectorize_quad = 1, 0 | expand quad
-vectorize_grads = 1, 0 | expand grad
+vectorization_quadloop = 1, 0 | expand quad
+vectorization_strategy = explicit, none | expand grad
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg
diff --git a/test/sumfact/poisson/poisson_dg_2d.mini b/test/sumfact/poisson/poisson_dg_2d.mini
index facaf3278d32ab03e6de7c99cd79450780ff69bb..99adc0e31563c6a85ecad18e349ed74adcaf21a0 100644
--- a/test/sumfact/poisson/poisson_dg_2d.mini
+++ b/test/sumfact/poisson/poisson_dg_2d.mini
@@ -17,8 +17,8 @@ extension = vtu
 numerical_jacobian = 1, 0 | expand num
 sumfact = 1
 compare_l2errorsquared = 5e-5, 5e-7 | expand deg
-vectorize_quad = 1, 0 | expand quad
-vectorize_grads = 1, 0 | expand grad
+vectorization_quadloop = 1, 0 | expand quad
+vectorization_strategy = explicit, none | expand grad
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg
diff --git a/test/sumfact/poisson/poisson_dg_3d.mini b/test/sumfact/poisson/poisson_dg_3d.mini
index ee766a8d9d56cfd0a5ec9d4e622ee3cdc540fd97..b23fda0eba605025076e6a92dfb295ea06525d00 100644
--- a/test/sumfact/poisson/poisson_dg_3d.mini
+++ b/test/sumfact/poisson/poisson_dg_3d.mini
@@ -17,8 +17,8 @@ extension = vtu
 numerical_jacobian = 1, 0 | expand num
 sumfact = 1
 compare_l2errorsquared = 1e-4, 5e-6 | expand deg
-vectorize_quad = 1, 0 | expand quad
-vectorize_grads = 1, 0 | expand grad
+vectorization_quadloop = 1, 0 | expand quad
+vectorization_strategy = explicit, none | expand grad
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg
diff --git a/test/sumfact/poisson/poisson_dg_tensor.mini b/test/sumfact/poisson/poisson_dg_tensor.mini
index fcf3d2a6aea2116bb37303ea691c9a55d8a92ed6..4a45e4a1fa469c6fc2753ad230b486bc55bd1b55 100644
--- a/test/sumfact/poisson/poisson_dg_tensor.mini
+++ b/test/sumfact/poisson/poisson_dg_tensor.mini
@@ -14,8 +14,8 @@ extension = vtu
 [formcompiler]
 sumfact = 1
 compare_l2errorsquared = 3e-4
-vectorize_quad = 1, 0 | expand quad
-vectorize_grads = 1, 0 | expand grad
+vectorization_quadloop = 1, 0 | expand quad
+vectorization_strategy = explicit, none | expand grad
 
 [formcompiler.ufl_variants]
 degree = 2
diff --git a/test/sumfact/poisson/poisson_fastdg_2d.mini b/test/sumfact/poisson/poisson_fastdg_2d.mini
index 2fcc2c4e51e029abcc6470202887d03b0b812d7f..541de8712b627f6327076d87586b6d378fa54e78 100644
--- a/test/sumfact/poisson/poisson_fastdg_2d.mini
+++ b/test/sumfact/poisson/poisson_fastdg_2d.mini
@@ -15,8 +15,8 @@ extension = vtu
 numerical_jacobian = 0
 sumfact = 1
 compare_l2errorsquared = 1e-4
-vectorize_quad = 1, 0 | expand quadvec
-vectorize_grads = 1, 0 | expand gradvec
+vectorization_quadloop = 1, 0 | expand quadvec
+vectorization_strategy = explicit, none | expand gradvec
 fastdg = 1
 
 [formcompiler.ufl_variants]
diff --git a/test/sumfact/poisson/poisson_fastdg_3d.mini b/test/sumfact/poisson/poisson_fastdg_3d.mini
index 78e7f891d6ac74776a6828aa77c59d2beff0d6e0..b5974a4fe62609ca038d315656bf3c9f333f3e32 100644
--- a/test/sumfact/poisson/poisson_fastdg_3d.mini
+++ b/test/sumfact/poisson/poisson_fastdg_3d.mini
@@ -15,8 +15,8 @@ extension = vtu
 numerical_jacobian = 0
 sumfact = 1
 compare_l2errorsquared = 1e-4
-vectorize_quad = 1, 0 | expand quadvec
-vectorize_grads = 1, 0 | expand gradvec
+vectorization_quadloop = 1, 0 | expand quadvec
+vectorization_strategy = explicit, none | expand gradvec
 fastdg = 1
 
 [formcompiler.ufl_variants]
diff --git a/test/sumfact/poisson/sliced.mini b/test/sumfact/poisson/sliced.mini
index 9240f97baabcec24bf6739ba730ffc8c76dd4453..39e9e915afb8b31495b3ed715265a72d5fa08555 100644
--- a/test/sumfact/poisson/sliced.mini
+++ b/test/sumfact/poisson/sliced.mini
@@ -10,8 +10,7 @@ extension = vtu
 [formcompiler]
 sumfact = 1
 compare_l2errorsquared = 1e-5
-vectorize_quad = 1
-vectorize_grads = 0
+vectorization_quadloop = 1
 vectorize_slice = 1
 quadrature_order = 6
 
diff --git a/test/sumfact/stokes/stokes.mini b/test/sumfact/stokes/stokes.mini
index 9260bae2fc94a33aa1a511b94f8be754adcb02f9..10dca54704f30369881095216a6f5f94c25585e0 100644
--- a/test/sumfact/stokes/stokes.mini
+++ b/test/sumfact/stokes/stokes.mini
@@ -13,6 +13,6 @@ extension = vtu
 
 [formcompiler]
 numerical_jacobian = 1, 0 | expand num
-vectorize_quad = 1, 0 | expand quad
+vectorization_quadloop = 1, 0 | expand quad
 compare_l2errorsquared = 1e-12
 sumfact = 1