diff --git a/Code/Source/CMakeLists.txt b/Code/Source/CMakeLists.txt
index c08631212..53ecbe84f 100644
--- a/Code/Source/CMakeLists.txt
+++ b/Code/Source/CMakeLists.txt
@@ -38,7 +38,7 @@ if(SV_USE_DUMMY_MPI)
             is set to true.")
 endif()
 
-set(FLOWSOLVER_SUBDIRS ${FLOWSOLVER_SUBDIRS} liner_solver)
+set(FLOWSOLVER_SUBDIRS ${FLOWSOLVER_SUBDIRS} linear_solver)
 set(FLOWSOLVER_SUBDIRS ${FLOWSOLVER_SUBDIRS} solver)
 
 #-----------------------------------------------------------------------------
diff --git a/Code/Source/liner_solver/CMakeLists.txt b/Code/Source/linear_solver/CMakeLists.txt
similarity index 100%
rename from Code/Source/liner_solver/CMakeLists.txt
rename to Code/Source/linear_solver/CMakeLists.txt
diff --git a/Code/Source/liner_solver/README.md b/Code/Source/linear_solver/README.md
similarity index 100%
rename from Code/Source/liner_solver/README.md
rename to Code/Source/linear_solver/README.md
diff --git a/Code/Source/liner_solver/add_bc_mul.cpp b/Code/Source/linear_solver/add_bc_mul.cpp
similarity index 100%
rename from Code/Source/liner_solver/add_bc_mul.cpp
rename to Code/Source/linear_solver/add_bc_mul.cpp
diff --git a/Code/Source/liner_solver/add_bc_mul.h b/Code/Source/linear_solver/add_bc_mul.h
similarity index 100%
rename from Code/Source/liner_solver/add_bc_mul.h
rename to Code/Source/linear_solver/add_bc_mul.h
diff --git a/Code/Source/liner_solver/bc.cpp b/Code/Source/linear_solver/bc.cpp
similarity index 100%
rename from Code/Source/liner_solver/bc.cpp
rename to Code/Source/linear_solver/bc.cpp
diff --git a/Code/Source/liner_solver/bcast.cpp b/Code/Source/linear_solver/bcast.cpp
similarity index 100%
rename from Code/Source/liner_solver/bcast.cpp
rename to Code/Source/linear_solver/bcast.cpp
diff --git a/Code/Source/liner_solver/bcast.h b/Code/Source/linear_solver/bcast.h
similarity index 100%
rename from Code/Source/liner_solver/bcast.h
rename to Code/Source/linear_solver/bcast.h
diff --git a/Code/Source/liner_solver/bicgs.cpp b/Code/Source/linear_solver/bicgs.cpp
similarity index 100%
rename from Code/Source/liner_solver/bicgs.cpp
rename to Code/Source/linear_solver/bicgs.cpp
diff --git a/Code/Source/liner_solver/bicgs.h b/Code/Source/linear_solver/bicgs.h
similarity index 100%
rename from Code/Source/liner_solver/bicgs.h
rename to Code/Source/linear_solver/bicgs.h
diff --git a/Code/Source/liner_solver/cgrad.cpp b/Code/Source/linear_solver/cgrad.cpp
similarity index 100%
rename from Code/Source/liner_solver/cgrad.cpp
rename to Code/Source/linear_solver/cgrad.cpp
diff --git a/Code/Source/liner_solver/cgrad.h b/Code/Source/linear_solver/cgrad.h
similarity index 100%
rename from Code/Source/liner_solver/cgrad.h
rename to Code/Source/linear_solver/cgrad.h
diff --git a/Code/Source/liner_solver/commu.cpp b/Code/Source/linear_solver/commu.cpp
similarity index 100%
rename from Code/Source/liner_solver/commu.cpp
rename to Code/Source/linear_solver/commu.cpp
diff --git a/Code/Source/liner_solver/commu.h b/Code/Source/linear_solver/commu.h
similarity index 100%
rename from Code/Source/liner_solver/commu.h
rename to Code/Source/linear_solver/commu.h
diff --git a/Code/Source/liner_solver/cput.cpp b/Code/Source/linear_solver/cput.cpp
similarity index 100%
rename from Code/Source/liner_solver/cput.cpp
rename to Code/Source/linear_solver/cput.cpp
diff --git a/Code/Source/liner_solver/dot.cpp b/Code/Source/linear_solver/dot.cpp
similarity index 100%
rename from Code/Source/liner_solver/dot.cpp
rename to Code/Source/linear_solver/dot.cpp
diff --git a/Code/Source/liner_solver/dot.h b/Code/Source/linear_solver/dot.h
similarity index 100%
rename from Code/Source/liner_solver/dot.h
rename to Code/Source/linear_solver/dot.h
diff --git a/Code/Source/liner_solver/fils_struct.cpp b/Code/Source/linear_solver/fils_struct.cpp
similarity index 100%
rename from Code/Source/liner_solver/fils_struct.cpp
rename to Code/Source/linear_solver/fils_struct.cpp
diff --git a/Code/Source/liner_solver/fils_struct.hpp b/Code/Source/linear_solver/fils_struct.hpp
similarity index 100%
rename from Code/Source/liner_solver/fils_struct.hpp
rename to Code/Source/linear_solver/fils_struct.hpp
diff --git a/Code/Source/liner_solver/fsils.hpp b/Code/Source/linear_solver/fsils.hpp
similarity index 100%
rename from Code/Source/liner_solver/fsils.hpp
rename to Code/Source/linear_solver/fsils.hpp
diff --git a/Code/Source/liner_solver/fsils_api.hpp b/Code/Source/linear_solver/fsils_api.hpp
similarity index 100%
rename from Code/Source/liner_solver/fsils_api.hpp
rename to Code/Source/linear_solver/fsils_api.hpp
diff --git a/Code/Source/liner_solver/fsils_std.h b/Code/Source/linear_solver/fsils_std.h
similarity index 100%
rename from Code/Source/liner_solver/fsils_std.h
rename to Code/Source/linear_solver/fsils_std.h
diff --git a/Code/Source/liner_solver/ge.cpp b/Code/Source/linear_solver/ge.cpp
similarity index 100%
rename from Code/Source/liner_solver/ge.cpp
rename to Code/Source/linear_solver/ge.cpp
diff --git a/Code/Source/liner_solver/ge.h b/Code/Source/linear_solver/ge.h
similarity index 100%
rename from Code/Source/liner_solver/ge.h
rename to Code/Source/linear_solver/ge.h
diff --git a/Code/Source/liner_solver/gmres.cpp b/Code/Source/linear_solver/gmres.cpp
similarity index 100%
rename from Code/Source/liner_solver/gmres.cpp
rename to Code/Source/linear_solver/gmres.cpp
diff --git a/Code/Source/liner_solver/gmres.h b/Code/Source/linear_solver/gmres.h
similarity index 100%
rename from Code/Source/liner_solver/gmres.h
rename to Code/Source/linear_solver/gmres.h
diff --git a/Code/Source/liner_solver/in_commu.cpp b/Code/Source/linear_solver/in_commu.cpp
similarity index 100%
rename from Code/Source/liner_solver/in_commu.cpp
rename to Code/Source/linear_solver/in_commu.cpp
diff --git a/Code/Source/liner_solver/lhs.cpp b/Code/Source/linear_solver/lhs.cpp
similarity index 100%
rename from Code/Source/liner_solver/lhs.cpp
rename to Code/Source/linear_solver/lhs.cpp
diff --git a/Code/Source/liner_solver/lhs.h b/Code/Source/linear_solver/lhs.h
similarity index 100%
rename from Code/Source/liner_solver/lhs.h
rename to Code/Source/linear_solver/lhs.h
diff --git a/Code/Source/liner_solver/ls.cpp b/Code/Source/linear_solver/ls.cpp
similarity index 100%
rename from Code/Source/liner_solver/ls.cpp
rename to Code/Source/linear_solver/ls.cpp
diff --git a/Code/Source/liner_solver/norm.cpp b/Code/Source/linear_solver/norm.cpp
similarity index 100%
rename from Code/Source/liner_solver/norm.cpp
rename to Code/Source/linear_solver/norm.cpp
diff --git a/Code/Source/liner_solver/norm.h b/Code/Source/linear_solver/norm.h
similarity index 100%
rename from Code/Source/liner_solver/norm.h
rename to Code/Source/linear_solver/norm.h
diff --git a/Code/Source/liner_solver/ns_solver.cpp b/Code/Source/linear_solver/ns_solver.cpp
similarity index 100%
rename from Code/Source/liner_solver/ns_solver.cpp
rename to Code/Source/linear_solver/ns_solver.cpp
diff --git a/Code/Source/liner_solver/ns_solver.h b/Code/Source/linear_solver/ns_solver.h
similarity index 100%
rename from Code/Source/liner_solver/ns_solver.h
rename to Code/Source/linear_solver/ns_solver.h
diff --git a/Code/Source/liner_solver/omp_la.cpp b/Code/Source/linear_solver/omp_la.cpp
similarity index 100%
rename from Code/Source/liner_solver/omp_la.cpp
rename to Code/Source/linear_solver/omp_la.cpp
diff --git a/Code/Source/liner_solver/omp_la.h b/Code/Source/linear_solver/omp_la.h
similarity index 100%
rename from Code/Source/liner_solver/omp_la.h
rename to Code/Source/linear_solver/omp_la.h
diff --git a/Code/Source/liner_solver/pc_gmres.cpp b/Code/Source/linear_solver/pc_gmres.cpp
similarity index 100%
rename from Code/Source/liner_solver/pc_gmres.cpp
rename to Code/Source/linear_solver/pc_gmres.cpp
diff --git a/Code/Source/liner_solver/pc_gmres.h b/Code/Source/linear_solver/pc_gmres.h
similarity index 100%
rename from Code/Source/liner_solver/pc_gmres.h
rename to Code/Source/linear_solver/pc_gmres.h
diff --git a/Code/Source/liner_solver/precond.cpp b/Code/Source/linear_solver/precond.cpp
similarity index 100%
rename from Code/Source/liner_solver/precond.cpp
rename to Code/Source/linear_solver/precond.cpp
diff --git a/Code/Source/liner_solver/precond.h b/Code/Source/linear_solver/precond.h
similarity index 100%
rename from Code/Source/liner_solver/precond.h
rename to Code/Source/linear_solver/precond.h
diff --git a/Code/Source/liner_solver/solve.cpp b/Code/Source/linear_solver/solve.cpp
similarity index 100%
rename from Code/Source/liner_solver/solve.cpp
rename to Code/Source/linear_solver/solve.cpp
diff --git a/Code/Source/liner_solver/spar_mul.cpp b/Code/Source/linear_solver/spar_mul.cpp
similarity index 100%
rename from Code/Source/liner_solver/spar_mul.cpp
rename to Code/Source/linear_solver/spar_mul.cpp
diff --git a/Code/Source/liner_solver/spar_mul.h b/Code/Source/linear_solver/spar_mul.h
similarity index 100%
rename from Code/Source/liner_solver/spar_mul.h
rename to Code/Source/linear_solver/spar_mul.h