diff --git a/NEWS.md b/NEWS.md
index 25847eaa9..5309cfcda 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Restrict to the active model the evaluation of a FE function at arbitrary points. Since PR [#752](https://github.com/gridap/Gridap.jl/pull/752).
+- Renamed `GridapODEs` to `ODEs`. Since PR [#756](https://github.com/gridap/Gridap.jl/pull/756)
 
 ## [0.17.9] - 2022-02-28
 
diff --git a/src/Exports.jl b/src/Exports.jl
index 77baa2867..9226e683c 100644
--- a/src/Exports.jl
+++ b/src/Exports.jl
@@ -177,7 +177,7 @@ using Gridap.CellData: ∫; export ∫
 @publish Visualization createpvd
 @publish Visualization savepvd
 
-include("GridapODEs/Exports.jl")
+include("ODEs/Exports.jl")
 
 # Deprecated / removed
 
diff --git a/src/Gridap.jl b/src/Gridap.jl
index 4d8bcd830..fe35f4aaa 100644
--- a/src/Gridap.jl
+++ b/src/Gridap.jl
@@ -19,7 +19,7 @@ The module is structured in the following sub-modules:
 - [`Gridap.Visualization`](@ref)
 - [`Gridap.FESpaces`](@ref)
 - [`Gridap.MultiField`](@ref)
-- [`Gridap.GridapODEs`](@ref)
+- [`Gridap.ODEs`](@ref)
 
 The exported names are:
 $(EXPORTS)
@@ -54,7 +54,7 @@ include("FESpaces/FESpaces.jl")
 
 include("MultiField/MultiField.jl")
 
-include("GridapODEs/GridapODEs.jl")
+include("ODEs/ODEs.jl")
 
 include("Exports.jl")
 
diff --git a/src/GridapODEs/DiffEqsWrappers/DiffEqsWrappers.jl b/src/ODEs/DiffEqsWrappers/DiffEqsWrappers.jl
similarity index 89%
rename from src/GridapODEs/DiffEqsWrappers/DiffEqsWrappers.jl
rename to src/ODEs/DiffEqsWrappers/DiffEqsWrappers.jl
index 5fe1c2188..54e5722f8 100644
--- a/src/GridapODEs/DiffEqsWrappers/DiffEqsWrappers.jl
+++ b/src/ODEs/DiffEqsWrappers/DiffEqsWrappers.jl
@@ -7,13 +7,13 @@ module DiffEqWrappers
 
 using Test
 
-using Gridap.GridapODEs.TransientFETools: TransientFEOperator
+using Gridap.ODEs.TransientFETools: TransientFEOperator
 
-using Gridap.GridapODEs.ODETools: allocate_cache
-using Gridap.GridapODEs.ODETools: update_cache!
-using Gridap.GridapODEs.ODETools: residual!
-using Gridap.GridapODEs.ODETools: jacobians!
-using Gridap.GridapODEs.ODETools: jacobian!
+using Gridap.ODEs.ODETools: allocate_cache
+using Gridap.ODEs.ODETools: update_cache!
+using Gridap.ODEs.ODETools: residual!
+using Gridap.ODEs.ODETools: jacobians!
+using Gridap.ODEs.ODETools: jacobian!
 
 using Gridap.Algebra: allocate_jacobian
 
diff --git a/src/GridapODEs/Exports.jl b/src/ODEs/Exports.jl
similarity index 94%
rename from src/GridapODEs/Exports.jl
rename to src/ODEs/Exports.jl
index d09c300f0..610abef7e 100644
--- a/src/GridapODEs/Exports.jl
+++ b/src/ODEs/Exports.jl
@@ -1,6 +1,6 @@
 macro publish_gridapodes(mod,name)
   quote
-    using Gridap.GridapODEs.$mod: $name; export $name
+    using Gridap.ODEs.$mod: $name; export $name
   end
 end
 
diff --git a/src/GridapODEs/ODETools/AffineNewmark.jl b/src/ODEs/ODETools/AffineNewmark.jl
similarity index 100%
rename from src/GridapODEs/ODETools/AffineNewmark.jl
rename to src/ODEs/ODETools/AffineNewmark.jl
diff --git a/src/GridapODEs/ODETools/AffineThetaMethod.jl b/src/ODEs/ODETools/AffineThetaMethod.jl
similarity index 100%
rename from src/GridapODEs/ODETools/AffineThetaMethod.jl
rename to src/ODEs/ODETools/AffineThetaMethod.jl
diff --git a/src/GridapODEs/ODETools/ConstantMatrixNewmark.jl b/src/ODEs/ODETools/ConstantMatrixNewmark.jl
similarity index 100%
rename from src/GridapODEs/ODETools/ConstantMatrixNewmark.jl
rename to src/ODEs/ODETools/ConstantMatrixNewmark.jl
diff --git a/src/GridapODEs/ODETools/ConstantNewmark.jl b/src/ODEs/ODETools/ConstantNewmark.jl
similarity index 100%
rename from src/GridapODEs/ODETools/ConstantNewmark.jl
rename to src/ODEs/ODETools/ConstantNewmark.jl
diff --git a/src/GridapODEs/ODETools/DiffOperators.jl b/src/ODEs/ODETools/DiffOperators.jl
similarity index 100%
rename from src/GridapODEs/ODETools/DiffOperators.jl
rename to src/ODEs/ODETools/DiffOperators.jl
diff --git a/src/GridapODEs/ODETools/ForwardEuler.jl b/src/ODEs/ODETools/ForwardEuler.jl
similarity index 100%
rename from src/GridapODEs/ODETools/ForwardEuler.jl
rename to src/ODEs/ODETools/ForwardEuler.jl
diff --git a/src/GridapODEs/ODETools/Newmark.jl b/src/ODEs/ODETools/Newmark.jl
similarity index 100%
rename from src/GridapODEs/ODETools/Newmark.jl
rename to src/ODEs/ODETools/Newmark.jl
diff --git a/src/GridapODEs/ODETools/ODEOperators.jl b/src/ODEs/ODETools/ODEOperators.jl
similarity index 100%
rename from src/GridapODEs/ODETools/ODEOperators.jl
rename to src/ODEs/ODETools/ODEOperators.jl
diff --git a/src/GridapODEs/ODETools/ODESolutions.jl b/src/ODEs/ODETools/ODESolutions.jl
similarity index 100%
rename from src/GridapODEs/ODETools/ODESolutions.jl
rename to src/ODEs/ODETools/ODESolutions.jl
diff --git a/src/GridapODEs/ODETools/ODESolvers.jl b/src/ODEs/ODETools/ODESolvers.jl
similarity index 100%
rename from src/GridapODEs/ODETools/ODESolvers.jl
rename to src/ODEs/ODETools/ODESolvers.jl
diff --git a/src/GridapODEs/ODETools/ODETools.jl b/src/ODEs/ODETools/ODETools.jl
similarity index 100%
rename from src/GridapODEs/ODETools/ODETools.jl
rename to src/ODEs/ODETools/ODETools.jl
diff --git a/src/GridapODEs/ODETools/RungeKutta.jl b/src/ODEs/ODETools/RungeKutta.jl
similarity index 100%
rename from src/GridapODEs/ODETools/RungeKutta.jl
rename to src/ODEs/ODETools/RungeKutta.jl
diff --git a/src/GridapODEs/ODETools/ThetaMethod.jl b/src/ODEs/ODETools/ThetaMethod.jl
similarity index 100%
rename from src/GridapODEs/ODETools/ThetaMethod.jl
rename to src/ODEs/ODETools/ThetaMethod.jl
diff --git a/src/GridapODEs/GridapODEs.jl b/src/ODEs/ODEs.jl
similarity index 85%
rename from src/GridapODEs/GridapODEs.jl
rename to src/ODEs/ODEs.jl
index db1fcbe02..22ab64320 100644
--- a/src/GridapODEs/GridapODEs.jl
+++ b/src/ODEs/ODEs.jl
@@ -3,7 +3,7 @@
 The exported names are
 $(EXPORTS)
 """
-module GridapODEs
+module ODEs
 
 using DocStringExtensions
 
@@ -14,3 +14,5 @@ include("TransientFETools/TransientFETools.jl")
 # include("DiffEqsWrappers/DiffEqsWrappers.jl")
 
 end #module
+
+const GridapODEs = ODEs
diff --git a/src/GridapODEs/TransientFETools/ODEOperatorInterfaces.jl b/src/ODEs/TransientFETools/ODEOperatorInterfaces.jl
similarity index 100%
rename from src/GridapODEs/TransientFETools/ODEOperatorInterfaces.jl
rename to src/ODEs/TransientFETools/ODEOperatorInterfaces.jl
diff --git a/src/GridapODEs/TransientFETools/TransientCellField.jl b/src/ODEs/TransientFETools/TransientCellField.jl
similarity index 100%
rename from src/GridapODEs/TransientFETools/TransientCellField.jl
rename to src/ODEs/TransientFETools/TransientCellField.jl
diff --git a/src/GridapODEs/TransientFETools/TransientFEOperators.jl b/src/ODEs/TransientFETools/TransientFEOperators.jl
similarity index 100%
rename from src/GridapODEs/TransientFETools/TransientFEOperators.jl
rename to src/ODEs/TransientFETools/TransientFEOperators.jl
diff --git a/src/GridapODEs/TransientFETools/TransientFESolutions.jl b/src/ODEs/TransientFETools/TransientFESolutions.jl
similarity index 100%
rename from src/GridapODEs/TransientFETools/TransientFESolutions.jl
rename to src/ODEs/TransientFETools/TransientFESolutions.jl
diff --git a/src/GridapODEs/TransientFETools/TransientFESpaces.jl b/src/ODEs/TransientFETools/TransientFESpaces.jl
similarity index 100%
rename from src/GridapODEs/TransientFETools/TransientFESpaces.jl
rename to src/ODEs/TransientFETools/TransientFESpaces.jl
diff --git a/src/GridapODEs/TransientFETools/TransientFETools.jl b/src/ODEs/TransientFETools/TransientFETools.jl
similarity index 73%
rename from src/GridapODEs/TransientFETools/TransientFETools.jl
rename to src/ODEs/TransientFETools/TransientFETools.jl
index 38f9f98f2..4cc6f801d 100644
--- a/src/GridapODEs/TransientFETools/TransientFETools.jl
+++ b/src/ODEs/TransientFETools/TransientFETools.jl
@@ -12,8 +12,8 @@ using Gridap.Helpers
 
 export ∂t
 
-import Gridap.GridapODEs.ODETools: ∂t, ∂tt
-import Gridap.GridapODEs.ODETools: time_derivative
+import Gridap.ODEs.ODETools: ∂t, ∂tt
+import Gridap.ODEs.ODETools: time_derivative
 
 export TransientTrialFESpace
 export TransientMultiFieldFESpace
@@ -41,22 +41,22 @@ export TransientConstantFEOperator
 export TransientConstantMatrixFEOperator
 using Gridap.FESpaces: Assembler
 using Gridap.FESpaces: SparseMatrixAssembler
-import Gridap.GridapODEs.ODETools: allocate_cache
-import Gridap.GridapODEs.ODETools: update_cache!
-import Gridap.GridapODEs.ODETools: ODEOperator
-import Gridap.GridapODEs.ODETools: AffineODEOperator
-import Gridap.GridapODEs.ODETools: ConstantODEOperator
-import Gridap.GridapODEs.ODETools: ConstantMatrixODEOperator
-import Gridap.GridapODEs.ODETools: allocate_residual
-import Gridap.GridapODEs.ODETools: allocate_jacobian
-import Gridap.GridapODEs.ODETools: residual!
-import Gridap.GridapODEs.ODETools: jacobian!
-import Gridap.GridapODEs.ODETools: jacobians!
-import Gridap.GridapODEs.ODETools: OperatorType
-using Gridap.GridapODEs.ODETools: Nonlinear
-using Gridap.GridapODEs.ODETools: Affine
-using Gridap.GridapODEs.ODETools: Constant
-using Gridap.GridapODEs.ODETools: ConstantMatrix
+import Gridap.ODEs.ODETools: allocate_cache
+import Gridap.ODEs.ODETools: update_cache!
+import Gridap.ODEs.ODETools: ODEOperator
+import Gridap.ODEs.ODETools: AffineODEOperator
+import Gridap.ODEs.ODETools: ConstantODEOperator
+import Gridap.ODEs.ODETools: ConstantMatrixODEOperator
+import Gridap.ODEs.ODETools: allocate_residual
+import Gridap.ODEs.ODETools: allocate_jacobian
+import Gridap.ODEs.ODETools: residual!
+import Gridap.ODEs.ODETools: jacobian!
+import Gridap.ODEs.ODETools: jacobians!
+import Gridap.ODEs.ODETools: OperatorType
+using Gridap.ODEs.ODETools: Nonlinear
+using Gridap.ODEs.ODETools: Affine
+using Gridap.ODEs.ODETools: Constant
+using Gridap.ODEs.ODETools: ConstantMatrix
 import Gridap.FESpaces: get_algebraic_operator
 import Gridap.FESpaces: assemble_vector!
 import Gridap.FESpaces: assemble_matrix_add!
@@ -70,14 +70,14 @@ using Gridap.FESpaces: return_type
 import Gridap.FESpaces: SparseMatrixAssembler
 import Gridap.FESpaces: get_trial
 import Gridap.FESpaces: get_test
-using Gridap.GridapODEs.ODETools: test_ode_operator
+using Gridap.ODEs.ODETools: test_ode_operator
 export test_transient_fe_operator
 
 import Gridap.FESpaces: FESolver
-import Gridap.GridapODEs.ODETools: ODESolver
+import Gridap.ODEs.ODETools: ODESolver
 import Gridap.Algebra: solve
 import Gridap.Algebra: solve!
-import Gridap.GridapODEs.ODETools: solve_step!
+import Gridap.ODEs.ODETools: solve_step!
 export test_transient_fe_solver
 
 export TransientFEFunction
@@ -89,8 +89,8 @@ import Gridap.MultiField: num_fields
 
 export TransientFESolution
 import Gridap.Algebra: solve
-import Gridap.GridapODEs.ODETools: ODESolution
-import Gridap.GridapODEs.ODETools: GenericODESolution
+import Gridap.ODEs.ODETools: ODESolution
+import Gridap.ODEs.ODETools: GenericODESolution
 import Base: iterate
 export test_transient_fe_solution
 
diff --git a/src/GridapODEs/TransientFETools/TransientMultiFieldCellField.jl b/src/ODEs/TransientFETools/TransientMultiFieldCellField.jl
similarity index 100%
rename from src/GridapODEs/TransientFETools/TransientMultiFieldCellField.jl
rename to src/ODEs/TransientFETools/TransientMultiFieldCellField.jl
diff --git a/test/GridapODEsTests/DiffEqsWrappersTests/DiffEqsTests.jl b/test/ODEsTests/DiffEqsWrappersTests/DiffEqsTests.jl
similarity index 94%
rename from test/GridapODEsTests/DiffEqsWrappersTests/DiffEqsTests.jl
rename to test/ODEsTests/DiffEqsWrappersTests/DiffEqsTests.jl
index f07830a77..0f5d7262b 100644
--- a/test/GridapODEsTests/DiffEqsWrappersTests/DiffEqsTests.jl
+++ b/test/ODEsTests/DiffEqsWrappersTests/DiffEqsTests.jl
@@ -2,10 +2,10 @@ module DiffEqsWrapperTests
 
 using Test
 using Gridap
-using Gridap.GridapODEs
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
-using Gridap.GridapODEs.DiffEqWrappers
+using Gridap.ODEs
+using Gridap.ODEs.ODETools
+using Gridap.ODEs.TransientFETools
+using Gridap.ODEs.DiffEqWrappers
 
 # using DifferentialEquations
 # using Sundials
@@ -54,7 +54,7 @@ function fe_problem(u, n)
 
 end
 
-# Solving the heat equation using Gridap.GridapODEs and DiffEqs
+# Solving the heat equation using Gridap.ODEs and DiffEqs
 tspan = (0.0, 1.0)
 
 u(x, t) = t
diff --git a/test/GridapODEsTests/DiffEqsWrappersTests/runtests.jl b/test/ODEsTests/DiffEqsWrappersTests/runtests.jl
similarity index 100%
rename from test/GridapODEsTests/DiffEqsWrappersTests/runtests.jl
rename to test/ODEsTests/DiffEqsWrappersTests/runtests.jl
diff --git a/test/GridapODEsTests/ODEsTests/DiffOperatorsTests.jl b/test/ODEsTests/ODEsTests/DiffOperatorsTests.jl
similarity index 97%
rename from test/GridapODEsTests/ODEsTests/DiffOperatorsTests.jl
rename to test/ODEsTests/ODEsTests/DiffOperatorsTests.jl
index 56e1015bd..452838bed 100644
--- a/test/GridapODEsTests/ODEsTests/DiffOperatorsTests.jl
+++ b/test/ODEsTests/ODEsTests/DiffOperatorsTests.jl
@@ -2,8 +2,8 @@ module DiffOperatorsTests
 
 using Gridap
 using Test
-using Gridap.GridapODEs
-using Gridap.GridapODEs.ODETools: ∂t, ∂tt
+using Gridap.ODEs
+using Gridap.ODEs.ODETools: ∂t, ∂tt
 
 using ForwardDiff
 
diff --git a/test/GridapODEsTests/ODEsTests/ODEOperatorMocks.jl b/test/ODEsTests/ODEsTests/ODEOperatorMocks.jl
similarity index 81%
rename from test/GridapODEsTests/ODEsTests/ODEOperatorMocks.jl
rename to test/ODEsTests/ODEsTests/ODEOperatorMocks.jl
index 17f566bda..fb6ddb533 100644
--- a/test/GridapODEsTests/ODEsTests/ODEOperatorMocks.jl
+++ b/test/ODEsTests/ODEsTests/ODEOperatorMocks.jl
@@ -6,16 +6,16 @@
 # u_1_tt + b * u_1_t - a * u_1 = 0
 # u_2_tt + a * u_1_t - b * u_1 - c * u_2 = 0
 
-import Gridap.GridapODEs.ODETools: ODEOperator
-import Gridap.GridapODEs.ODETools: AffineODEOperator
-import Gridap.GridapODEs.ODETools: ConstantODEOperator
-import Gridap.GridapODEs.ODETools: allocate_cache
-import Gridap.GridapODEs.ODETools: update_cache!
-import Gridap.GridapODEs.ODETools: allocate_residual
-import Gridap.GridapODEs.ODETools: jacobian!
-import Gridap.GridapODEs.ODETools: jacobians!
-import Gridap.GridapODEs.ODETools: allocate_jacobian
-import Gridap.GridapODEs.ODETools: residual!
+import Gridap.ODEs.ODETools: ODEOperator
+import Gridap.ODEs.ODETools: AffineODEOperator
+import Gridap.ODEs.ODETools: ConstantODEOperator
+import Gridap.ODEs.ODETools: allocate_cache
+import Gridap.ODEs.ODETools: update_cache!
+import Gridap.ODEs.ODETools: allocate_residual
+import Gridap.ODEs.ODETools: jacobian!
+import Gridap.ODEs.ODETools: jacobians!
+import Gridap.ODEs.ODETools: allocate_jacobian
+import Gridap.ODEs.ODETools: residual!
 using SparseArrays: spzeros
 
 struct ODEOperatorMock{T<:Real,C} <: ODEOperator{C}
diff --git a/test/GridapODEsTests/ODEsTests/ODEOperatorsTests.jl b/test/ODEsTests/ODEsTests/ODEOperatorsTests.jl
similarity index 90%
rename from test/GridapODEsTests/ODEsTests/ODEOperatorsTests.jl
rename to test/ODEsTests/ODEsTests/ODEOperatorsTests.jl
index 8c2c1e9a9..955674342 100644
--- a/test/GridapODEsTests/ODEsTests/ODEOperatorsTests.jl
+++ b/test/ODEsTests/ODEsTests/ODEOperatorsTests.jl
@@ -1,9 +1,9 @@
 module ODEOperatorsTests
 
-using Gridap.GridapODEs.ODETools
+using Gridap.ODEs.ODETools
 using Test
 
-import Gridap.GridapODEs.ODETools: test_ode_operator
+import Gridap.ODEs.ODETools: test_ode_operator
 
 include("ODEOperatorMocks.jl")
 
diff --git a/test/GridapODEsTests/ODEsTests/ODESolutionsTests.jl b/test/ODEsTests/ODEsTests/ODESolutionsTests.jl
similarity index 74%
rename from test/GridapODEsTests/ODEsTests/ODESolutionsTests.jl
rename to test/ODEsTests/ODEsTests/ODESolutionsTests.jl
index 3a29aeec2..b5782eee3 100644
--- a/test/GridapODEsTests/ODEsTests/ODESolutionsTests.jl
+++ b/test/ODEsTests/ODEsTests/ODESolutionsTests.jl
@@ -1,14 +1,14 @@
 module ODESolversTests
 
-using Gridap.GridapODEs.ODETools: GenericODESolution
-using Gridap.GridapODEs.ODETools: BackwardEuler
-using Gridap.GridapODEs.ODETools: BackwardEulerNonlinearOperator
-using Gridap.GridapODEs.ODETools: solve!
+using Gridap.ODEs.ODETools: GenericODESolution
+using Gridap.ODEs.ODETools: BackwardEuler
+using Gridap.ODEs.ODETools: BackwardEulerNonlinearOperator
+using Gridap.ODEs.ODETools: solve!
 
 using Test
 using Gridap
-using Gridap.GridapODEs
-using Gridap.GridapODEs.ODETools
+using Gridap.ODEs
+using Gridap.ODEs.ODETools
 
 
 include("ODEOperatorMocks.jl")
diff --git a/test/GridapODEsTests/ODEsTests/ODESolverMocks.jl b/test/ODEsTests/ODEsTests/ODESolverMocks.jl
similarity index 85%
rename from test/GridapODEsTests/ODEsTests/ODESolverMocks.jl
rename to test/ODEsTests/ODEsTests/ODESolverMocks.jl
index 7ae341376..c1abd152f 100644
--- a/test/GridapODEsTests/ODEsTests/ODESolverMocks.jl
+++ b/test/ODEsTests/ODEsTests/ODESolverMocks.jl
@@ -3,14 +3,14 @@ using Gridap.Algebra: jacobian
 import Gridap.Algebra: NonlinearSolver
 import Gridap.Algebra: NonlinearOperator
 import Gridap.Algebra: solve!
-import Gridap.GridapODEs.ODETools: solve_step!
-import Gridap.GridapODEs.ODETools: ODESolver
-import Gridap.GridapODEs.ODETools: zero_initial_guess
-import Gridap.GridapODEs.ODETools: residual!
-import Gridap.GridapODEs.ODETools: jacobian!
-import Gridap.GridapODEs.ODETools: solve!
-import Gridap.GridapODEs.ODETools: allocate_residual
-import Gridap.GridapODEs.ODETools: allocate_jacobian
+import Gridap.ODEs.ODETools: solve_step!
+import Gridap.ODEs.ODETools: ODESolver
+import Gridap.ODEs.ODETools: zero_initial_guess
+import Gridap.ODEs.ODETools: residual!
+import Gridap.ODEs.ODETools: jacobian!
+import Gridap.ODEs.ODETools: solve!
+import Gridap.ODEs.ODETools: allocate_residual
+import Gridap.ODEs.ODETools: allocate_jacobian
 
 struct OperatorMock <: NonlinearOperator
   odeop
diff --git a/test/GridapODEsTests/ODEsTests/ODESolversTests.jl b/test/ODEsTests/ODEsTests/ODESolversTests.jl
similarity index 91%
rename from test/GridapODEsTests/ODEsTests/ODESolversTests.jl
rename to test/ODEsTests/ODEsTests/ODESolversTests.jl
index d4b816ebd..7914420ad 100644
--- a/test/GridapODEsTests/ODEsTests/ODESolversTests.jl
+++ b/test/ODEsTests/ODEsTests/ODESolversTests.jl
@@ -1,13 +1,13 @@
 # module ODESolversTests
 
-using Gridap.GridapODEs
-using Gridap.GridapODEs.ODETools: GenericODESolution
-using Gridap.GridapODEs.ODETools: BackwardEuler
-using Gridap.GridapODEs.ODETools: RungeKutta
-using Gridap.GridapODEs.ODETools: ThetaMethodNonlinearOperator
-using Gridap.GridapODEs.ODETools: solve!
-using Gridap.GridapODEs
-using Gridap.GridapODEs.ODETools
+using Gridap.ODEs
+using Gridap.ODEs.ODETools: GenericODESolution
+using Gridap.ODEs.ODETools: BackwardEuler
+using Gridap.ODEs.ODETools: RungeKutta
+using Gridap.ODEs.ODETools: ThetaMethodNonlinearOperator
+using Gridap.ODEs.ODETools: solve!
+using Gridap.ODEs
+using Gridap.ODEs.ODETools
 using Gridap
 using Test
 
diff --git a/test/GridapODEsTests/ODEsTests/runtests.jl b/test/ODEsTests/ODEsTests/runtests.jl
similarity index 100%
rename from test/GridapODEsTests/ODEsTests/runtests.jl
rename to test/ODEsTests/ODEsTests/runtests.jl
diff --git a/test/GridapODEsTests/TransientFEsTests/AffineFEOperatorsTests.jl b/test/ODEsTests/TransientFEsTests/AffineFEOperatorsTests.jl
similarity index 88%
rename from test/GridapODEsTests/TransientFEsTests/AffineFEOperatorsTests.jl
rename to test/ODEsTests/TransientFEsTests/AffineFEOperatorsTests.jl
index f5a8a9dbd..4dc4e72dd 100644
--- a/test/GridapODEsTests/TransientFEsTests/AffineFEOperatorsTests.jl
+++ b/test/ODEsTests/TransientFEsTests/AffineFEOperatorsTests.jl
@@ -4,14 +4,9 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 using LineSearches: BackTracking
 
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
-
 θ = 1.0
 
 u(x,t) = (1.0-x[1])*x[1]*(1.0-x[2])*x[2]*t
diff --git a/test/GridapODEsTests/TransientFEsTests/BoundaryHeatEquationTests.jl b/test/ODEsTests/TransientFEsTests/BoundaryHeatEquationTests.jl
similarity index 93%
rename from test/GridapODEsTests/TransientFEsTests/BoundaryHeatEquationTests.jl
rename to test/ODEsTests/TransientFEsTests/BoundaryHeatEquationTests.jl
index e54d5ccad..0754767bd 100644
--- a/test/GridapODEsTests/TransientFEsTests/BoundaryHeatEquationTests.jl
+++ b/test/ODEsTests/TransientFEsTests/BoundaryHeatEquationTests.jl
@@ -4,12 +4,10 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 
 import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
+import Gridap.ODEs.TransientFETools: ∂t
 
 θ = 0.2
 
diff --git a/test/GridapODEsTests/TransientFEsTests/ConstantFEOperatorsTests.jl b/test/ODEsTests/TransientFEsTests/ConstantFEOperatorsTests.jl
similarity index 88%
rename from test/GridapODEsTests/TransientFEsTests/ConstantFEOperatorsTests.jl
rename to test/ODEsTests/TransientFEsTests/ConstantFEOperatorsTests.jl
index 410fe5fa3..d5aade45b 100644
--- a/test/GridapODEsTests/TransientFEsTests/ConstantFEOperatorsTests.jl
+++ b/test/ODEsTests/TransientFEsTests/ConstantFEOperatorsTests.jl
@@ -4,14 +4,9 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 using LineSearches: BackTracking
 
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
-
 θ = 1.0
 
 u(x,t) = (1.0-x[1])*x[1]*(1.0-x[2])*x[2]
diff --git a/test/GridapODEsTests/TransientFEsTests/DGHeatEquationTests.jl b/test/ODEsTests/TransientFEsTests/DGHeatEquationTests.jl
similarity index 95%
rename from test/GridapODEsTests/TransientFEsTests/DGHeatEquationTests.jl
rename to test/ODEsTests/TransientFEsTests/DGHeatEquationTests.jl
index 71448ad13..9bdb1869e 100644
--- a/test/GridapODEsTests/TransientFEsTests/DGHeatEquationTests.jl
+++ b/test/ODEsTests/TransientFEsTests/DGHeatEquationTests.jl
@@ -4,8 +4,6 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 
 θ = 0.2
diff --git a/test/GridapODEsTests/TransientFEsTests/ForwardEulerHeatEquationTests.jl b/test/ODEsTests/TransientFEsTests/ForwardEulerHeatEquationTests.jl
similarity index 90%
rename from test/GridapODEsTests/TransientFEsTests/ForwardEulerHeatEquationTests.jl
rename to test/ODEsTests/TransientFEsTests/ForwardEulerHeatEquationTests.jl
index df70114a7..d8997b977 100644
--- a/test/GridapODEsTests/TransientFEsTests/ForwardEulerHeatEquationTests.jl
+++ b/test/ODEsTests/TransientFEsTests/ForwardEulerHeatEquationTests.jl
@@ -4,12 +4,9 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
+import Gridap.ODEs.TransientFETools: ∂t
 
 θ = 0.0
 
diff --git a/test/GridapODEsTests/TransientFEsTests/FreeSurfacePotentialFlowTests.jl b/test/ODEsTests/TransientFEsTests/FreeSurfacePotentialFlowTests.jl
similarity index 97%
rename from test/GridapODEsTests/TransientFEsTests/FreeSurfacePotentialFlowTests.jl
rename to test/ODEsTests/TransientFEsTests/FreeSurfacePotentialFlowTests.jl
index a8fa2491f..efc7fbf6c 100644
--- a/test/GridapODEsTests/TransientFEsTests/FreeSurfacePotentialFlowTests.jl
+++ b/test/ODEsTests/TransientFEsTests/FreeSurfacePotentialFlowTests.jl
@@ -2,8 +2,6 @@ module FreeSurfacePotentialFlowTests
 
 using Gridap
 using Gridap.Geometry
-using Gridap.GridapODEs.TransientFETools
-using Gridap.GridapODEs.ODETools
 using Test
 
 # Parameters
diff --git a/test/GridapODEsTests/TransientFEsTests/HeatEquationAutoDiffTests.jl b/test/ODEsTests/TransientFEsTests/HeatEquationAutoDiffTests.jl
similarity index 96%
rename from test/GridapODEsTests/TransientFEsTests/HeatEquationAutoDiffTests.jl
rename to test/ODEsTests/TransientFEsTests/HeatEquationAutoDiffTests.jl
index 8ac26065c..088336a70 100644
--- a/test/GridapODEsTests/TransientFEsTests/HeatEquationAutoDiffTests.jl
+++ b/test/ODEsTests/TransientFEsTests/HeatEquationAutoDiffTests.jl
@@ -4,8 +4,8 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
+using Gridap.ODEs.ODETools
+using Gridap.ODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 using Gridap.Arrays: test_array
 
diff --git a/test/GridapODEsTests/TransientFEsTests/HeatEquationTests.jl b/test/ODEsTests/TransientFEsTests/HeatEquationTests.jl
similarity index 90%
rename from test/GridapODEsTests/TransientFEsTests/HeatEquationTests.jl
rename to test/ODEsTests/TransientFEsTests/HeatEquationTests.jl
index 65ab32454..a2a95605a 100644
--- a/test/GridapODEsTests/TransientFEsTests/HeatEquationTests.jl
+++ b/test/ODEsTests/TransientFEsTests/HeatEquationTests.jl
@@ -4,13 +4,8 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
-
 θ = 0.2
 
 u(x,t) = (1.0-x[1])*x[1]*(1.0-x[2])*x[2]*t
diff --git a/test/GridapODEsTests/TransientFEsTests/HeatVectorEquationTests.jl b/test/ODEsTests/TransientFEsTests/HeatVectorEquationTests.jl
similarity index 92%
rename from test/GridapODEsTests/TransientFEsTests/HeatVectorEquationTests.jl
rename to test/ODEsTests/TransientFEsTests/HeatVectorEquationTests.jl
index 7dd4fb762..63f55987d 100644
--- a/test/GridapODEsTests/TransientFEsTests/HeatVectorEquationTests.jl
+++ b/test/ODEsTests/TransientFEsTests/HeatVectorEquationTests.jl
@@ -4,12 +4,9 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
-
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
+using Gridap.ODEs.ODETools
+using Gridap.ODEs.TransientFETools
 
 θ = 0.5
 
@@ -93,7 +90,7 @@ ode_solver.θ == 0.0 ? dtθ = dt : dtθ = dt*ode_solver.θ
 tθ = t0+dtθ
 ode_cache = update_cache!(ode_cache,odeop,tθ)
 
-using Gridap.GridapODEs.ODETools: ThetaMethodNonlinearOperator
+using Gridap.ODEs.ODETools: ThetaMethodNonlinearOperator
 nlop = ThetaMethodNonlinearOperator(odeop,tθ,dtθ,u0,ode_cache,vθ)
 
 nl_cache = solve!(uf,ode_solver.nls,nlop,nl_cache)
diff --git a/test/GridapODEsTests/TransientFEsTests/StokesEquationAutoDiffTests.jl b/test/ODEsTests/TransientFEsTests/StokesEquationAutoDiffTests.jl
similarity index 93%
rename from test/GridapODEsTests/TransientFEsTests/StokesEquationAutoDiffTests.jl
rename to test/ODEsTests/TransientFEsTests/StokesEquationAutoDiffTests.jl
index 9988665af..a977d48a4 100644
--- a/test/GridapODEsTests/TransientFEsTests/StokesEquationAutoDiffTests.jl
+++ b/test/ODEsTests/TransientFEsTests/StokesEquationAutoDiffTests.jl
@@ -4,15 +4,10 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
+using Gridap.ODEs.TransientFETools
 using Gridap.FESpaces
 using Gridap.Arrays: test_array
 
-# using Gridap.GridapODEs.ODETools: ThetaMethodLinear
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
-
 θ = 0.5
 
 u(x,t) = VectorValue(x[1],x[2])*t
diff --git a/test/GridapODEsTests/TransientFEsTests/StokesEquationTests.jl b/test/ODEsTests/TransientFEsTests/StokesEquationTests.jl
similarity index 90%
rename from test/GridapODEsTests/TransientFEsTests/StokesEquationTests.jl
rename to test/ODEsTests/TransientFEsTests/StokesEquationTests.jl
index 05d50cc89..b32e2bea6 100644
--- a/test/GridapODEsTests/TransientFEsTests/StokesEquationTests.jl
+++ b/test/ODEsTests/TransientFEsTests/StokesEquationTests.jl
@@ -4,13 +4,8 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 
-# using Gridap.GridapODEs.ODETools: ThetaMethodLinear
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
 
 θ = 0.5
 
diff --git a/test/GridapODEsTests/TransientFEsTests/Transient2ndOrderFEOperatorsTests.jl b/test/ODEsTests/TransientFEsTests/Transient2ndOrderFEOperatorsTests.jl
similarity index 97%
rename from test/GridapODEsTests/TransientFEsTests/Transient2ndOrderFEOperatorsTests.jl
rename to test/ODEsTests/TransientFEsTests/Transient2ndOrderFEOperatorsTests.jl
index d9f4b4652..22dc61c6a 100644
--- a/test/GridapODEsTests/TransientFEsTests/Transient2ndOrderFEOperatorsTests.jl
+++ b/test/ODEsTests/TransientFEsTests/Transient2ndOrderFEOperatorsTests.jl
@@ -1,8 +1,6 @@
 module Transient2nOrderFEOperatorsTests
 
 using Gridap
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Test
 
 # Analytical functions
diff --git a/test/GridapODEsTests/TransientFEsTests/TransientFEOperatorsTests.jl b/test/ODEsTests/TransientFEsTests/TransientFEOperatorsTests.jl
similarity index 90%
rename from test/GridapODEsTests/TransientFEsTests/TransientFEOperatorsTests.jl
rename to test/ODEsTests/TransientFEsTests/TransientFEOperatorsTests.jl
index e0f4cc0d9..880b84e36 100644
--- a/test/GridapODEsTests/TransientFEsTests/TransientFEOperatorsTests.jl
+++ b/test/ODEsTests/TransientFEsTests/TransientFEOperatorsTests.jl
@@ -4,15 +4,10 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
+using Gridap.ODEs.ODETools
+using Gridap.ODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 
-# using Gridap.GridapODEs.ODETools: ThetaMethodLinear
-
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
-
 θ = 0.4
 
 # Analytical functions
@@ -95,7 +90,7 @@ ode_solver.θ == 0.0 ? dtθ = dt : dtθ = dt*ode_solver.θ
 tθ = t0+dtθ
 ode_cache = update_cache!(ode_cache,odeop,tθ)
 
-using Gridap.GridapODEs.ODETools: ThetaMethodNonlinearOperator
+using Gridap.ODEs.ODETools: ThetaMethodNonlinearOperator
 nlop = ThetaMethodNonlinearOperator(odeop,tθ,dtθ,u0,ode_cache,vθ)
 
 nl_cache = solve!(uf,ode_solver.nls,nlop,nl_cache)
diff --git a/test/GridapODEsTests/TransientFEsTests/TransientFETests.jl b/test/ODEsTests/TransientFEsTests/TransientFETests.jl
similarity index 96%
rename from test/GridapODEsTests/TransientFEsTests/TransientFETests.jl
rename to test/ODEsTests/TransientFEsTests/TransientFETests.jl
index 42ed75ca4..078db30ee 100644
--- a/test/GridapODEsTests/TransientFEsTests/TransientFETests.jl
+++ b/test/ODEsTests/TransientFEsTests/TransientFETests.jl
@@ -2,8 +2,8 @@ module TransientFETests
 
 using Gridap
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
+using Gridap.ODEs.ODETools
+using Gridap.ODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 
 u(x,t) = (x[1] + x[2])*t
@@ -17,7 +17,7 @@ import Gridap: ∇
 θ = 1.0
 
 ∂tu(t) = x -> x[1]+x[2]
-import Gridap.GridapODEs.TransientFETools: ∂t
+import Gridap.ODEs.TransientFETools: ∂t
 ∂t(::typeof(u)) = ∂tu
 @test ∂t(u) === ∂tu
 
@@ -130,7 +130,7 @@ uf = copy(u0)
 dt = solver.dt
 tf = t0+dt
 update_cache!(ode_cache,odeop,tf)
-using Gridap.GridapODEs.ODETools: ThetaMethodNonlinearOperator
+using Gridap.ODEs.ODETools: ThetaMethodNonlinearOperator
 vf = copy(u0)
 nlop = ThetaMethodNonlinearOperator(odeop,tf,dt,u0,ode_cache,vf)
 
diff --git a/test/GridapODEsTests/TransientFEsTests/VectorHeatEquationTests.jl b/test/ODEsTests/TransientFEsTests/VectorHeatEquationTests.jl
similarity index 89%
rename from test/GridapODEsTests/TransientFEsTests/VectorHeatEquationTests.jl
rename to test/ODEsTests/TransientFEsTests/VectorHeatEquationTests.jl
index e91f71f3a..26b394415 100644
--- a/test/GridapODEsTests/TransientFEsTests/VectorHeatEquationTests.jl
+++ b/test/ODEsTests/TransientFEsTests/VectorHeatEquationTests.jl
@@ -4,15 +4,8 @@ using Gridap
 using ForwardDiff
 using LinearAlgebra
 using Test
-using Gridap.GridapODEs.ODETools
-using Gridap.GridapODEs.TransientFETools
 using Gridap.FESpaces: get_algebraic_operator
 
-# using Gridap.GridapODEs.ODETools: ThetaMethodLinear
-
-import Gridap: ∇
-import Gridap.GridapODEs.TransientFETools: ∂t
-
 θ = 1.0
 
 u(x,t) = (1.0-x[1])*x[1]*(1.0-x[2])*x[2]*t
diff --git a/test/GridapODEsTests/TransientFEsTests/runtests.jl b/test/ODEsTests/TransientFEsTests/runtests.jl
similarity index 100%
rename from test/GridapODEsTests/TransientFEsTests/runtests.jl
rename to test/ODEsTests/TransientFEsTests/runtests.jl
diff --git a/test/GridapODEsTests/runtests.jl b/test/ODEsTests/runtests.jl
similarity index 93%
rename from test/GridapODEsTests/runtests.jl
rename to test/ODEsTests/runtests.jl
index 8b5137590..efab0ea42 100644
--- a/test/GridapODEsTests/runtests.jl
+++ b/test/ODEsTests/runtests.jl
@@ -1,4 +1,4 @@
-module GridapODEsTests
+module ODEsTests
 
 using Test
 
diff --git a/test/runtests.jl b/test/runtests.jl
index 48e2814be..2868d53e0 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -30,6 +30,6 @@ using Test
 
 @time @testset "MultiField" begin include("MultiFieldTests/runtests.jl") end
 
-@time @testset "GridapODEs" begin include("GridapODEsTests/runtests.jl") end
+@time @testset "ODEs" begin include("ODEsTests/runtests.jl") end
 
 end # module