--- a/dmd/template.c	Wed Jan 06 15:18:19 2010 -0300
+++ b/dmd/template.c	Wed Jan 06 15:18:20 2010 -0300
@@ -847,7 +847,7 @@
     assert(fd->type->ty == Tfunction);
     fdtype = (TypeFunction *)fd->type;
 
-    nfparams = Argument::dim(fdtype->parameters); // number of function parameters
+    nfparams = Parameter::dim(fdtype->parameters); // number of function parameters
     nfargs = fargs ? fargs->dim : 0;		// number of function arguments
 
     /* Check for match of function arguments with variadic template
@@ -877,7 +877,7 @@
 	     */
 	    for (fptupindex = 0; fptupindex < nfparams; fptupindex++)
 	    {
-		Argument *fparam = (Argument *)fdtype->parameters->data[fptupindex];
+		Parameter *fparam = (Parameter *)fdtype->parameters->data[fptupindex];
 		if (fparam->type->ty != Tident)
 		    continue;
 		TypeIdentifier *tid = (TypeIdentifier *)fparam->type;
@@ -951,7 +951,7 @@
 	    continue;
 	}
 
-	Argument *fparam = Argument::getNth(fdtype->parameters, i);
+	Parameter *fparam = Parameter::getNth(fdtype->parameters, i);
 
 	if (i >= nfargs)		// if not enough arguments
 	{
@@ -996,7 +996,7 @@
 		TypeDelegate *td = (TypeDelegate *)fparam->type->toBasetype();
 		TypeFunction *tf = (TypeFunction *)td->next;
 
-		if (!tf->varargs && Argument::dim(tf->parameters) == 0)
+		if (!tf->varargs && Parameter::dim(tf->parameters) == 0)
 		{
 		    m = farg->type->deduceType(paramscope, tf->next, parameters, &dedtypes);
 		    if (!m && tf->next->toBasetype()->ty == Tvoid)
@@ -1744,8 +1744,8 @@
 	    linkage != tp->linkage)
 	    return MATCHnomatch;
 
-	size_t nfargs = Argument::dim(this->parameters);
-	size_t nfparams = Argument::dim(tp->parameters);
+	size_t nfargs = Parameter::dim(this->parameters);
+	size_t nfparams = Parameter::dim(tp->parameters);
 
 	/* See if tuple match
 	 */
@@ -1754,7 +1754,7 @@
 	    /* See if 'A' of the template parameter matches 'A'
 	     * of the type of the last function parameter.
 	     */
-	    Argument *fparam = Argument::getNth(tp->parameters, nfparams - 1);
+	    Parameter *fparam = Parameter::getNth(tp->parameters, nfparams - 1);
 	    if (fparam->type->ty != Tident)
 		goto L1;
 	    TypeIdentifier *tid = (TypeIdentifier *)fparam->type;
@@ -1787,7 +1787,7 @@
 		if (!t || t->objects.dim != tuple_dim)
 		    return MATCHnomatch;
 		for (size_t i = 0; i < tuple_dim; i++)
-		{   Argument *arg = Argument::getNth(this->parameters, nfparams - 1 + i);
+		{   Parameter *arg = Parameter::getNth(this->parameters, nfparams - 1 + i);
 		    if (!arg->type->equals((Object *)t->objects.data[i]))
 			return MATCHnomatch;
 		}
@@ -1797,7 +1797,7 @@
 		Tuple *t = new Tuple();
 		t->objects.setDim(tuple_dim);
 		for (size_t i = 0; i < tuple_dim; i++)
-		{   Argument *arg = Argument::getNth(this->parameters, nfparams - 1 + i);
+		{   Parameter *arg = Parameter::getNth(this->parameters, nfparams - 1 + i);
 		    t->objects.data[i] = (void *)arg->type;
 		}
 		dedtypes->data[tupi] = (void *)t;
@@ -1812,8 +1812,8 @@
     L2:
 	for (size_t i = 0; i < nfparams; i++)
 	{
-	    Argument *a = Argument::getNth(this->parameters, i);
-	    Argument *ap = Argument::getNth(tp->parameters, i);
+	    Parameter *a = Parameter::getNth(this->parameters, i);
+	    Parameter *ap = Parameter::getNth(tp->parameters, i);
 	    if (a->storageClass != ap->storageClass ||
 		!a->type->deduceType(sc, ap->type, parameters, dedtypes))
 		return MATCHnomatch;
@@ -2406,7 +2406,7 @@
 	printf("\tSpecialization: %s\n", specType->toChars());
     if (defaultType)
 	printf("\tDefault:        %s\n", defaultType->toChars());
-    printf("\tArgument:       %s\n", t ? t->toChars() : "NULL");
+    printf("\tParameter:       %s\n", t ? t->toChars() : "NULL");
     printf("\tDeduced Type:   %s\n", ta->toChars());
 }
 
@@ -2622,7 +2622,7 @@
     Dsymbol *sa = isDsymbol(oded);
     assert(sa);
 
-    printf("\tArgument alias: %s\n", sa->toChars());
+    printf("\tParameter alias: %s\n", sa->toChars());
 }
 
 void TemplateAliasParameter::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
@@ -2866,7 +2866,7 @@
 
     if (specValue)
 	printf("\tSpecialization: %s\n", specValue->toChars());
-    printf("\tArgument Value: %s\n", ea ? ea->toChars() : "NULL");
+    printf("\tParameter Value: %s\n", ea ? ea->toChars() : "NULL");
 }
 
 
@@ -3580,7 +3580,7 @@
 		    if (dim)
 		    {	tiargs->reserve(dim);
 			for (size_t i = 0; i < dim; i++)
-			{   Argument *arg = (Argument *)tt->arguments->data[i];
+			{   Parameter *arg = (Parameter *)tt->arguments->data[i];
 			    tiargs->insert(j + i, arg->type);
 			}
 		    }