Index: src/AST/TypeSubstitution.cpp
===================================================================
--- src/AST/TypeSubstitution.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/AST/TypeSubstitution.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeSubstitution.cc --
+// TypeSubstitution.cpp --
 //
 // Author           : Richard C. Bilson
Index: src/Common/Assert.cpp
===================================================================
--- src/Common/Assert.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Common/Assert.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Assert.cc --
+// Assert.cpp --
 //
 // Author           : Peter A. Buhr
@@ -22,5 +22,5 @@
 #define CFA_ASSERT_FMT "*CFA assertion error* \"%s\" from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
-// called by macro assert in assert.h
+// called by macro assert in cassert
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
 	fprintf( stderr, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
Index: src/Common/FilterCombos.hpp
===================================================================
--- src/Common/FilterCombos.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Common/FilterCombos.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -22,5 +22,5 @@
 
 /// Combo iterator that simply collects values into a vector, marking all values as valid.
-/// Prefer combos in typeops.h to use of IntoVectorComboIter with filterCombos
+/// Prefer combos in Typeops.hpp to use of IntoVectorComboIter with filterCombos
 /// @param T	The element type of the vector.
 template<typename T>
Index: src/Common/Stats.hpp
===================================================================
--- src/Common/Stats.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Common/Stats.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -24,5 +24,5 @@
 
 These can be enabled using the --stats option, to which a comma seperated list of options can be passed.
-For more details see Stats.cc
+For more information, see Stats/Stats.cpp
 
 Counters:
Index: src/Common/Stats/Base.hpp
===================================================================
--- src/Common/Stats/Base.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Common/Stats/Base.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.h --
+// Heap.hpp --
 //
 // Author           : Thierry Delisle
Index: src/Common/Stats/Heap.cpp
===================================================================
--- src/Common/Stats/Heap.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Common/Stats/Heap.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.cc --
+// Heap.cpp --
 //
 // Author           : Thierry Delisle
@@ -69,5 +69,5 @@
 		void stacktrace_push(size_t id) {
 			++stacktrace_depth;
-			assertf(stacktrace_depth < stacktrace_max_depth, "Stack trace too deep: increase size of array in Heap.cc");
+			assertf(stacktrace_depth < stacktrace_max_depth, "Stack trace too deep: increase size of array in Heap.cpp");
 			trace[stacktrace_depth] = id;
 		}
@@ -87,5 +87,5 @@
 			passes_cnt++;
 
-			assertf(passes_cnt < passes_size, "Too many passes for Stats::Heap, increase the size of the array in Heap.cc");
+			assertf(passes_cnt < passes_size, "Too many passes for Stats::Heap, increase the size of the array in Heap.cpp");
 		}
 
Index: src/Common/Stats/Stats.cpp
===================================================================
--- src/Common/Stats/Stats.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Common/Stats/Stats.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Stats.cc --
+// Stats.cpp --
 //
 // Author           : Thierry Delisle
Index: src/CompilationState.cpp
===================================================================
--- src/CompilationState.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/CompilationState.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CompilationState.cc --
+// CompilationState.cpp --
 //
 // Author           : Rob Schluntz
Index: src/Concurrency/Waituntil.hpp
===================================================================
--- src/Concurrency/Waituntil.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Concurrency/Waituntil.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Waitfor.h --
+// Waituntil.hpp --
 //
 // Author           : Thierry Delisle
Index: src/GenPoly/ErasableScopedMap.hpp
===================================================================
--- src/GenPoly/ErasableScopedMap.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/GenPoly/ErasableScopedMap.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ErasableScopedMap.h -- A map that supports scoping and erasing elements.
+// ErasableScopedMap.hpp -- A map that supports scoping and erasing elements.
 //
 // Author           : Aaron B. Moss
Index: src/GenPoly/GenPoly.cpp
===================================================================
--- src/GenPoly/GenPoly.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/GenPoly/GenPoly.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -256,5 +256,5 @@
 
 	// So remaining types can be examined case by case.
-	// Recurse through type structure (conditions borrowed from Unify.cc).
+	// Recurse through type structure (conditions borrowed from Unify.cpp).
 
 	if ( type_index(typeid(ast::BasicType)) == lid ) {
Index: src/GenPoly/Lvalue.hpp
===================================================================
--- src/GenPoly/Lvalue.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/GenPoly/Lvalue.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Lvalue.h -- Clean up lvalues and remove references.
+// Lvalue.hpp -- Clean up lvalues and remove references.
 //
 // Author           : Richard C. Bilson
Index: src/GenPoly/Lvalue2.cpp
===================================================================
--- src/GenPoly/Lvalue2.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/GenPoly/Lvalue2.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Lvalue2.cc -- Seperate Lvalue module for linking.
+// Lvalue2.cpp -- Seperate Lvalue module for linking.
 //
 // Author           : Andrew Beach
Index: src/GenPoly/ScopedSet.hpp
===================================================================
--- src/GenPoly/ScopedSet.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/GenPoly/ScopedSet.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScopedSet.h -- A set that supports save/restore scoping.
+// ScopedSet.hpp -- A set that supports save/restore scoping.
 //
 // Author           : Aaron B. Moss
Index: src/GenPoly/Specialize.hpp
===================================================================
--- src/GenPoly/Specialize.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/GenPoly/Specialize.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Specialize.h -- Generate thunks to specialize polymorphic functions.
+// Specialize.hpp -- Generate thunks to specialize polymorphic functions.
 //
 // Author           : Richard C. Bilson
Index: src/InitTweak/GenInit.cpp
===================================================================
--- src/InitTweak/GenInit.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/InitTweak/GenInit.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -333,6 +333,5 @@
 
 ast::ConstructorInit * genCtorInit( const CodeLocation & loc, const ast::ObjectDecl * objDecl ) {
-	// call into genImplicitCall from Autogen.h to generate calls to ctor/dtor for each
-	// constructable object
+	// Call genImplicitCall to generate calls to ctor/dtor for each constructable object.
 	InitExpander srcParam{ objDecl->init }, nullParam{ (const ast::Init *)nullptr };
 	ast::ptr< ast::Expr > dstParam = new ast::VariableExpr(loc, objDecl);
Index: src/InitTweak/InitTweak.hpp
===================================================================
--- src/InitTweak/InitTweak.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/InitTweak/InitTweak.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// InitTweak.h --
+// InitTweak.hpp --
 //
 // Author           : Rob Schluntz
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Makefile.am	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -73,5 +73,5 @@
 cfa_cpplib_PROGRAMS += $(DEMANGLER)
 EXTRA_PROGRAMS = ../driver/demangler
-___driver_demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
+___driver_demangler_SOURCES = SymTab/demangler.cpp # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
 ___driver_demangler_LDADD = libdemangle.a -ldl			# yywrap
 noinst_LIBRARIES = $(LIBDEMANGLE)
Index: src/ResolvExpr/AdjustExprType.cpp
===================================================================
--- src/ResolvExpr/AdjustExprType.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/ResolvExpr/AdjustExprType.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// AdjustExprType_old.cc --
+// AdjustExprType.cpp --
 //
 // Author           : Richard C. Bilson
Index: src/ResolvExpr/PolyCost.cpp
===================================================================
--- src/ResolvExpr/PolyCost.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/ResolvExpr/PolyCost.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PolyCost.cc --
+// PolyCost.cpp --
 //
 // Author           : Richard C. Bilson
Index: src/ResolvExpr/PtrsAssignable.cpp
===================================================================
--- src/ResolvExpr/PtrsAssignable.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/ResolvExpr/PtrsAssignable.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PtrsAssignable.cc --
+// PtrsAssignable.cpp --
 //
 // Author           : Richard C. Bilson
Index: src/ResolvExpr/PtrsCastable.cpp
===================================================================
--- src/ResolvExpr/PtrsCastable.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/ResolvExpr/PtrsCastable.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PtrsCastable.cc --
+// PtrsCastable.cpp --
 //
 // Author           : Richard C. Bilson
Index: src/ResolvExpr/SpecCost.cpp
===================================================================
--- src/ResolvExpr/SpecCost.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/ResolvExpr/SpecCost.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SpecCost.cc --
+// SpecCost.cpp --
 //
 // Author           : Aaron B. Moss
Index: src/Tuples/Tuples.hpp
===================================================================
--- src/Tuples/Tuples.hpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Tuples/Tuples.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -27,10 +27,10 @@
 namespace Tuples {
 
-// TupleAssignment.cc
+// TupleAssignment.cpp
 void handleTupleAssignment(
 	ResolvExpr::CandidateFinder & finder, const ast::UntypedExpr * assign,
 	std::vector< ResolvExpr::CandidateFinder > & args );
 
-// TupleExpansion.cc
+// TupleExpansion.cpp
 /// Expands z.[a, b.[x, y], c] into [z.a, z.b.x, z.b.y, z.c], inserting UniqueExprs as appropriate.
 void expandMemberTuples( ast::TranslationUnit & translationUnit );
Index: src/Virtual/Tables.cpp
===================================================================
--- src/Virtual/Tables.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/Virtual/Tables.cpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Tables.cc --
+// Tables.cpp --
 //
 // Author           : Andrew Beach
Index: src/include/cassert
===================================================================
--- src/include/cassert	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/include/cassert	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// assert.h --
+// cassert --
 //
 // Author           : Peter A. Buhr
Index: src/include/optional
===================================================================
--- src/include/optional	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
+++ src/include/optional	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// optional.h --
+// optional --
 //
 // Author           : Michael L. Brooks