diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index ab414e8c6e..417bbb4902 100644
--- a/development/cmake/src/tex2lyx/CMakeLists.txt
+++ b/development/cmake/src/tex2lyx/CMakeLists.txt
@@ -19,15 +19,15 @@ set(LINKED_FILES
 
 set(tex2lyx_sources
 	${TOP_SRC_DIR}/src/tex2lyx/boost.cpp
-	${TOP_SRC_DIR}/src/tex2lyx/context.C
+	${TOP_SRC_DIR}/src/tex2lyx/Context.cpp
 	${TOP_SRC_DIR}/src/tex2lyx/gettext.cpp
 	${TOP_SRC_DIR}/src/tex2lyx/lengthcommon.cpp
 	${TOP_SRC_DIR}/src/tex2lyx/LyXFont.cpp
-	${TOP_SRC_DIR}/src/tex2lyx/texparser.C
-	${TOP_SRC_DIR}/src/tex2lyx/tex2lyx.C
-	${TOP_SRC_DIR}/src/tex2lyx/preamble.C
-	${TOP_SRC_DIR}/src/tex2lyx/math.C
-	${TOP_SRC_DIR}/src/tex2lyx/table.C
+	${TOP_SRC_DIR}/src/tex2lyx/Parser.cpp
+	${TOP_SRC_DIR}/src/tex2lyx/tex2lyx.cpp
+	${TOP_SRC_DIR}/src/tex2lyx/preamble.cpp
+	${TOP_SRC_DIR}/src/tex2lyx/math.cpp
+	${TOP_SRC_DIR}/src/tex2lyx/table.cpp
 	${TOP_SRC_DIR}/src/tex2lyx/text.cpp
 )
 
@@ -35,9 +35,9 @@ set(tex2lyx_headers
 	${TOP_SRC_DIR}/src/LyXLayout.h
 	${TOP_SRC_DIR}/src/LyXTextClass.h
 	${TOP_SRC_DIR}/src/tex2lyx/Spacing.h
-	${TOP_SRC_DIR}/src/tex2lyx/context.h
+	${TOP_SRC_DIR}/src/tex2lyx/Context.h
 	${TOP_SRC_DIR}/src/tex2lyx/LyXFont.h
-	${TOP_SRC_DIR}/src/tex2lyx/texparser.h
+	${TOP_SRC_DIR}/src/tex2lyx/Parser.h
 	${TOP_SRC_DIR}/src/tex2lyx/tex2lyx.h
 )
 
diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index b5e31f1572..9efae2cb2f 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -925,10 +925,10 @@ src_client_files = Split('''
 
 src_tex2lyx_header_files = Split('''
     Spacing.h
-    context.h
+    Context.h
     LyXFont.h
     tex2lyx.h
-    texparser.h
+    Parser.h
 ''')
 
 
@@ -936,7 +936,7 @@ src_tex2lyx_files = Split('''
     FloatList.cpp
     Floating.cpp
     boost.cpp
-    context.C
+    Context.cpp
     Counters.cpp
     gettext.cpp
     lengthcommon.cpp
@@ -944,11 +944,11 @@ src_tex2lyx_files = Split('''
     LyXLayout.cpp
     LyXLex.cpp
     LyXTextClass.cpp
-    math.C
-    preamble.C
-    table.C
-    tex2lyx.C
-    texparser.C
+    math.cpp
+    preamble.cpp
+    table.cpp
+    tex2lyx.cpp
+    Parser.cpp
     text.cpp
 ''')
 
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 1481063aa7..c887d39075 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -7,8 +7,8 @@ DISTCLEANFILES += tex2lyx.1 $(LINKED_FILES)
 #noinst_LTLIBRARIES = libtexparser.la
 #
 #libtexparser_la_SOURCES = \
-#	texparser.C \
-#	texparser.h
+#	Parser.cpp \
+#	Parser.h
 #
 #tex2lyx_LDADD = libtexparser.la
 
@@ -38,19 +38,19 @@ tex2lyx_SOURCES = \
 	$(LINKED_FILES) \
 	Spacing.h \
 	boost.cpp \
-	context.C \
-	context.h \
+	Context.cpp \
+	Context.h \
 	gettext.cpp \
 	lengthcommon.cpp \
 	LyXFont.cpp \
 	LyXFont.h \
-	texparser.C \
-	texparser.h \
-	tex2lyx.C \
+	Parser.cpp \
+	Parser.h \
+	tex2lyx.cpp \
 	tex2lyx.h \
-	preamble.C \
-	math.C \
-	table.C \
+	preamble.cpp \
+	math.cpp \
+	table.cpp \
 	text.cpp
 
 tex2lyx_LDADD = \
diff --git a/src/tex2lyx/context.C b/src/tex2lyx/context.C
index 12404d9d12..36d1ec1782 100644
--- a/src/tex2lyx/context.C
+++ b/src/tex2lyx/context.C
@@ -1,5 +1,5 @@
 /**
- * \file context.C
+ * \file Context.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #include <iostream>
 
 #include "support/lstrings.h"
-#include "context.h"
+#include "Context.h"
 
 
 namespace lyx {
diff --git a/src/tex2lyx/context.h b/src/tex2lyx/context.h
index 7e795185ec..307e0d65e6 100644
--- a/src/tex2lyx/context.h
+++ b/src/tex2lyx/context.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file context.h
+ * \file Context.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/tex2lyx/math.C b/src/tex2lyx/math.C
index 7e03031872..c2af18f009 100644
--- a/src/tex2lyx/math.C
+++ b/src/tex2lyx/math.C
@@ -1,5 +1,5 @@
 /**
- * \file math.C
+ * \file math.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/tex2lyx/preamble.C b/src/tex2lyx/preamble.C
index 5b1344570b..db16af2081 100644
--- a/src/tex2lyx/preamble.C
+++ b/src/tex2lyx/preamble.C
@@ -1,5 +1,5 @@
 /**
- * \file preamble.C
+ * \file preamble.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/tex2lyx/table.C b/src/tex2lyx/table.C
index 1179a55c04..35de97af6a 100644
--- a/src/tex2lyx/table.C
+++ b/src/tex2lyx/table.C
@@ -1,5 +1,5 @@
 /**
- * \file table.C
+ * \file table.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -36,7 +36,7 @@ using std::string;
 using std::vector;
 
 
-// filled in preamble.C
+// filled in preamble.cpp
 std::map<char, int> special_columns;
 
 
diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index b421c1f1ed..81afdaec6f 100644
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -1,5 +1,5 @@
 /**
- * \file tex2lyx.C
+ * \file tex2lyx.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #include <config.h>
 
 #include "tex2lyx.h"
-#include "context.h"
+#include "Context.h"
 
 #include "debug.h"
 #include "LyXTextClass.h"
diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 4452c77b79..bde27dab57 100644
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -13,7 +13,7 @@
 #ifndef TEX2LYX_H
 #define TEX2LYX_H
 
-#include "texparser.h"
+#include "Parser.h"
 #include "LyXTextClass.h"
 
 #include <iosfwd>
@@ -28,7 +28,7 @@ namespace support { class FileName; }
 
 class Context;
 
-/// in preamble.C
+/// in preamble.cpp
 LyXTextClass const parse_preamble(Parser & p, std::ostream & os, std::string const & forceclass);
 
 /// used packages with options
@@ -52,16 +52,16 @@ void parse_text_in_inset(Parser & p, std::ostream & os, unsigned flags,
 			 bool outer, Context const & context);
 
 
-/// in math.C
+/// in math.cpp
 void parse_math(Parser & p, std::ostream & os, unsigned flags, mode_type mode);
 
 
-/// in table.C
+/// in table.cpp
 void handle_tabular(Parser & p, std::ostream & os, bool is_long_tabular,
 		    Context & context);
 
 
-/// in tex2lyx.C
+/// in tex2lyx.cpp
 std::string const trim(std::string const & a, char const * p = " \t\n\r");
 
 void split(std::string const & s, std::vector<std::string> & result,
diff --git a/src/tex2lyx/texparser.C b/src/tex2lyx/texparser.C
index 52cb324eb2..cdd5c39921 100644
--- a/src/tex2lyx/texparser.C
+++ b/src/tex2lyx/texparser.C
@@ -1,5 +1,5 @@
 /**
- * \file texparser.C
+ * \file Parser.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "texparser.h"
+#include "Parser.h"
 
 #include <iostream>
 #include <sstream>
diff --git a/src/tex2lyx/texparser.h b/src/tex2lyx/texparser.h
index 8a1f37132f..5c84898210 100644
--- a/src/tex2lyx/texparser.h
+++ b/src/tex2lyx/texparser.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file texparser.h
+ * \file Parser.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index 5db0711a5c..136903a283 100644
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -14,7 +14,7 @@
 #include <config.h>
 
 #include "tex2lyx.h"
-#include "context.h"
+#include "Context.h"
 #include "FloatList.h"
 #include "lengthcommon.h"
 #include "support/lstrings.h"