diff --git a/src/insets/InsetCite.cpp b/src/insets/InsetCitation.cpp
similarity index 100%
rename from src/insets/InsetCite.cpp
rename to src/insets/InsetCitation.cpp
diff --git a/src/insets/InsetCite.h b/src/insets/InsetCitation.h
similarity index 100%
rename from src/insets/InsetCite.h
rename to src/insets/InsetCitation.h
diff --git a/src/insets/InsetPageBreak.cpp b/src/insets/InsetPagebreak.cpp
similarity index 100%
rename from src/insets/InsetPageBreak.cpp
rename to src/insets/InsetPagebreak.cpp
diff --git a/src/insets/InsetPageBreak.h b/src/insets/InsetPagebreak.h
similarity index 100%
rename from src/insets/InsetPageBreak.h
rename to src/insets/InsetPagebreak.h
diff --git a/src/mathed/InsetMathCommand.cpp b/src/mathed/CommandInset.cpp
similarity index 100%
rename from src/mathed/InsetMathCommand.cpp
rename to src/mathed/CommandInset.cpp
diff --git a/src/mathed/InsetMathCommand.h b/src/mathed/CommandInset.h
similarity index 100%
rename from src/mathed/InsetMathCommand.h
rename to src/mathed/CommandInset.h
diff --git a/src/mathed/MathData.cpp b/src/mathed/MathArray.cpp
similarity index 100%
rename from src/mathed/MathData.cpp
rename to src/mathed/MathArray.cpp
diff --git a/src/mathed/MathData.h b/src/mathed/MathArray.h
similarity index 100%
rename from src/mathed/MathData.h
rename to src/mathed/MathArray.h
diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/MathMacro.cpp
similarity index 100%
rename from src/mathed/InsetMathMacro.cpp
rename to src/mathed/MathMacro.cpp
diff --git a/src/mathed/InsetMathMacro.h b/src/mathed/MathMacro.h
similarity index 100%
rename from src/mathed/InsetMathMacro.h
rename to src/mathed/MathMacro.h
diff --git a/src/mathed/MathReplace.h b/src/mathed/ReplaceData.h
similarity index 100%
rename from src/mathed/MathReplace.h
rename to src/mathed/ReplaceData.h