diff --git a/opm/core/transport/reorder/TransportModelInterface.cpp b/opm/core/transport/reorder/ReorderSolverInterface.cpp
similarity index 100%
rename from opm/core/transport/reorder/TransportModelInterface.cpp
rename to opm/core/transport/reorder/ReorderSolverInterface.cpp
diff --git a/opm/core/transport/reorder/TransportModelInterface.hpp b/opm/core/transport/reorder/ReorderSolverInterface.hpp
similarity index 100%
rename from opm/core/transport/reorder/TransportModelInterface.hpp
rename to opm/core/transport/reorder/ReorderSolverInterface.hpp
diff --git a/opm/core/transport/reorder/TransportModelTracerTof.cpp b/opm/core/transport/reorder/TTofReorder.cpp
similarity index 100%
rename from opm/core/transport/reorder/TransportModelTracerTof.cpp
rename to opm/core/transport/reorder/TTofReorder.cpp
diff --git a/opm/core/transport/reorder/TransportModelTracerTof.hpp b/opm/core/transport/reorder/TTofReorder.hpp
similarity index 100%
rename from opm/core/transport/reorder/TransportModelTracerTof.hpp
rename to opm/core/transport/reorder/TTofReorder.hpp
diff --git a/opm/core/transport/reorder/TransportModelTracerTofDiscGal.cpp b/opm/core/transport/reorder/TofDiscGalReorder.cpp
similarity index 100%
rename from opm/core/transport/reorder/TransportModelTracerTofDiscGal.cpp
rename to opm/core/transport/reorder/TofDiscGalReorder.cpp
diff --git a/opm/core/transport/reorder/TransportModelTracerTofDiscGal.hpp b/opm/core/transport/reorder/TofDiscGalReorder.hpp
similarity index 100%
rename from opm/core/transport/reorder/TransportModelTracerTofDiscGal.hpp
rename to opm/core/transport/reorder/TofDiscGalReorder.hpp
diff --git a/opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp b/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
similarity index 100%
rename from opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp
rename to opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
diff --git a/opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp b/opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp
similarity index 100%
rename from opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp
rename to opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp