Index: src/ResolvExpr/AdjustExprType.cc
===================================================================
--- src/ResolvExpr/AdjustExprType.cc	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/AdjustExprType.cc	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 23:41:42 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 23:54:02 2015
-// Update Count     : 3
+// Last Modified On : Wed Mar  2 17:34:53 2016
+// Update Count     : 4
 // 
 
@@ -33,5 +33,5 @@
 		virtual Type* mutate( UnionInstType *aggregateUseType );
 		virtual Type* mutate( EnumInstType *aggregateUseType );
-		virtual Type* mutate( ContextInstType *aggregateUseType );
+		virtual Type* mutate( TraitInstType *aggregateUseType );
 		virtual Type* mutate( TypeInstType *aggregateUseType );
 		virtual Type* mutate( TupleType *tupleType );
@@ -87,5 +87,5 @@
 	}
 
-	Type *AdjustExprType::mutate( ContextInstType *aggregateUseType ) {
+	Type *AdjustExprType::mutate( TraitInstType *aggregateUseType ) {
 		return aggregateUseType;
 	}
Index: src/ResolvExpr/CommonType.cc
===================================================================
--- src/ResolvExpr/CommonType.cc	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/CommonType.cc	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 06:59:27 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 07:04:50 2015
-// Update Count     : 2
+// Last Modified On : Wed Mar  2 17:35:34 2016
+// Update Count     : 3
 //
 
@@ -35,5 +35,5 @@
 		virtual void visit( UnionInstType *aggregateUseType );
 		virtual void visit( EnumInstType *aggregateUseType );
-		virtual void visit( ContextInstType *aggregateUseType );
+		virtual void visit( TraitInstType *aggregateUseType );
 		virtual void visit( TypeInstType *aggregateUseType );
 		virtual void visit( TupleType *tupleType );
@@ -186,5 +186,5 @@
 	}
 
-	void CommonType::visit( ContextInstType *aggregateUseType ) {
+	void CommonType::visit( TraitInstType *aggregateUseType ) {
 	}
 
Index: src/ResolvExpr/ConversionCost.cc
===================================================================
--- src/ResolvExpr/ConversionCost.cc	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/ConversionCost.cc	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 07:06:19 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 26 14:35:59 2016
-// Update Count     : 5
+// Last Modified On : Wed Mar  2 17:35:46 2016
+// Update Count     : 6
 //
 
@@ -206,5 +206,5 @@
 	}
 
-	void ConversionCost::visit(ContextInstType *inst) {
+	void ConversionCost::visit(TraitInstType *inst) {
 	}
 
Index: src/ResolvExpr/ConversionCost.h
===================================================================
--- src/ResolvExpr/ConversionCost.h	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/ConversionCost.h	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 09:37:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 09:39:23 2015
-// Update Count     : 2
+// Last Modified On : Wed Mar  2 17:35:56 2016
+// Update Count     : 3
 //
 
@@ -37,5 +37,5 @@
 		virtual void visit(UnionInstType *aggregateUseType);
 		virtual void visit(EnumInstType *aggregateUseType);
-		virtual void visit(ContextInstType *aggregateUseType);
+		virtual void visit(TraitInstType *aggregateUseType);
 		virtual void visit(TypeInstType *aggregateUseType);
 		virtual void visit(TupleType *tupleType);
Index: src/ResolvExpr/PtrsAssignable.cc
===================================================================
--- src/ResolvExpr/PtrsAssignable.cc	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/PtrsAssignable.cc	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:44:11 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Sep 21 14:34:58 2015
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:36:05 2016
+// Update Count     : 8
 //
 
@@ -35,5 +35,5 @@
 		virtual void visit( UnionInstType *inst );
 		virtual void visit( EnumInstType *inst );
-		virtual void visit( ContextInstType *inst );
+		virtual void visit( TraitInstType *inst );
 		virtual void visit( TypeInstType *inst );
 		virtual void visit( TupleType *tupleType );
@@ -101,5 +101,5 @@
 	}
 
-	void PtrsAssignable::visit( ContextInstType *inst ) {
+	void PtrsAssignable::visit( TraitInstType *inst ) {
 		// I definitely don't think we should be doing anything here
 	}
Index: src/ResolvExpr/PtrsCastable.cc
===================================================================
--- src/ResolvExpr/PtrsCastable.cc	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/PtrsCastable.cc	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:48:00 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Oct 05 14:49:12 2015
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:36:18 2016
+// Update Count     : 8
 //
 
@@ -36,5 +36,5 @@
 		virtual void visit(UnionInstType *inst);
 		virtual void visit(EnumInstType *inst);
-		virtual void visit(ContextInstType *inst);
+		virtual void visit(TraitInstType *inst);
 		virtual void visit(TypeInstType *inst);
 		virtual void visit(TupleType *tupleType);
@@ -129,5 +129,5 @@
 	}
 
-	void PtrsCastable::visit(ContextInstType *inst) {
+	void PtrsCastable::visit(TraitInstType *inst) {
 		// I definitely don't think we should be doing anything here
 	}
Index: src/ResolvExpr/RenameVars.cc
===================================================================
--- src/ResolvExpr/RenameVars.cc	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/RenameVars.cc	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 12:05:18 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:51:35 2015
-// Update Count     : 4
+// Last Modified On : Wed Mar  2 17:36:32 2016
+// Update Count     : 5
 //
 
@@ -86,5 +86,5 @@
 	}
 
-	void RenameVars::visit( ContextInstType *aggregateUseType ) {
+	void RenameVars::visit( TraitInstType *aggregateUseType ) {
 		typeBefore( aggregateUseType );
 		acceptAll( aggregateUseType->get_parameters(), *this );
Index: src/ResolvExpr/RenameVars.h
===================================================================
--- src/ResolvExpr/RenameVars.h	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/RenameVars.h	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 12:10:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 12:11:53 2015
-// Update Count     : 2
+// Last Modified On : Wed Mar  2 17:36:39 2016
+// Update Count     : 3
 //
 
@@ -40,5 +40,5 @@
 		virtual void visit( UnionInstType *aggregateUseType );
 		virtual void visit( EnumInstType *aggregateUseType );
-		virtual void visit( ContextInstType *aggregateUseType );
+		virtual void visit( TraitInstType *aggregateUseType );
 		virtual void visit( TypeInstType *aggregateUseType );
 		virtual void visit( TupleType *tupleType );
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision bdad1679f40fec0e4461625698d690f39d1cb950)
+++ src/ResolvExpr/Unify.cc	(revision 40404257da8f22441f6123bdbff37bdb54e0e5f3)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Sep 02 14:43:22 2015
-// Update Count     : 36
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:37:05 2016
+// Update Count     : 37
 //
 
@@ -56,5 +56,5 @@
 		virtual void visit(UnionInstType *aggregateUseType);
 		virtual void visit(EnumInstType *aggregateUseType);
-		virtual void visit(ContextInstType *aggregateUseType);
+		virtual void visit(TraitInstType *aggregateUseType);
 		virtual void visit(TypeInstType *aggregateUseType);
 		virtual void visit(TupleType *tupleType);
@@ -541,5 +541,5 @@
 	}
 
-	void Unify::visit(ContextInstType *contextInst) {
+	void Unify::visit(TraitInstType *contextInst) {
 		handleRefType( contextInst, type2 );
 	}