src/cmd/5g/cgen.c      |  3 +--
 src/cmd/5g/galign.c    |  2 --
 src/cmd/5g/reg.c       |  1 -
 src/cmd/6g/galign.c    |  2 --
 src/cmd/6g/reg.c       |  2 --
 src/cmd/8g/cgen.c      |  2 +-
 src/cmd/8g/galign.c    |  2 --
 src/cmd/8g/reg.c       |  1 -
 src/cmd/gc/align.c     |  2 --
 src/cmd/gc/const.c     | 12 ++++++------
 src/cmd/gc/cplx.c      |  6 +++---
 src/cmd/gc/go.h        |  4 +---
 src/cmd/gc/lex.c       |  2 +-
 src/cmd/gc/print.c     |  4 ++--
 src/cmd/gc/reflect.c   |  7 -------
 src/cmd/gc/sinit.c     |  2 --
 src/cmd/gc/subr.c      |  8 +-------
 src/cmd/gc/typecheck.c |  7 ++-----
 src/cmd/gc/walk.c      |  2 +-
 src/cmd/ld/dwarf.c     |  4 ----

diff --git a/src/cmd/5g/cgen.c b/src/cmd/5g/cgen.c
index 7cfde993ebcc6d04b86e81563ce848a64c7bea88..032409baee3d6b7657843d7fcffccf55c63ecd9f 100644
--- a/src/cmd/5g/cgen.c
+++ b/src/cmd/5g/cgen.c
@@ -169,7 +169,7 @@ 		break;
 
 	case OREAL:
 	case OIMAG:
-	case OCMPLX:
+	case OCOMPLEX:
 		fatal("unexpected complex");
 		break;
 
@@ -879,7 +879,6 @@ 	nr = N;
 
 	switch(n->op) {
 	default:
-	def:
 		a = ONE;
 		if(!true)
 			a = OEQ;
diff --git a/src/cmd/5g/galign.c b/src/cmd/5g/galign.c
index 9c8760aea7c541d3f6d89a7ddac96460e3ad1705..0fece9a08ff27f9871c6b794e1679ddb0c06829f 100644
--- a/src/cmd/5g/galign.c
+++ b/src/cmd/5g/galign.c
@@ -17,8 +17,6 @@ {
 	"int",		TINT,		TINT32,
 	"uint",		TUINT,		TUINT32,
 	"uintptr",	TUINTPTR,	TUINT32,
-	"float",	TFLOAT,		TFLOAT32,
-	"complex",	TCOMPLEX,	TCOMPLEX64,
 	0
 };
 
diff --git a/src/cmd/5g/reg.c b/src/cmd/5g/reg.c
index d30d03b2060b37667ef0034f44814729abdeec04..3f1ec07e4eb52baceada1847229300675c4df122 100644
--- a/src/cmd/5g/reg.c
+++ b/src/cmd/5g/reg.c
@@ -1066,7 +1066,6 @@ 		break;
 
 	case TFLOAT32:
 	case TFLOAT64:
-	case TFLOAT:
 		i = BtoF(~b);
 		if(i && r->cost >= 0) {
 			r->regno = i+NREG;
diff --git a/src/cmd/6g/galign.c b/src/cmd/6g/galign.c
index bdfc9947e8145231a7eda863a0bbe7f7aeb21722..97bfb58e8894d0ea4f3cefc38b5560b44c0b9814 100644
--- a/src/cmd/6g/galign.c
+++ b/src/cmd/6g/galign.c
@@ -17,8 +17,6 @@ {
 	"int",		TINT,		TINT32,
 	"uint",		TUINT,		TUINT32,
 	"uintptr",	TUINTPTR,	TUINT64,
-	"float",	TFLOAT,		TFLOAT32,
-	"complex",	TCOMPLEX,	TCOMPLEX64,
 	0
 };
 
diff --git a/src/cmd/6g/reg.c b/src/cmd/6g/reg.c
index 464627066389a989eab10a5af6cf2592a0cf6cec..1e1d64c59e9449526990215403db2ea93f45568c 100644
--- a/src/cmd/6g/reg.c
+++ b/src/cmd/6g/reg.c
@@ -748,7 +748,6 @@ 	case TUINTPTR:
 	case TPTR64:
 		p1->as = AMOVQ;
 		break;
-	case TFLOAT:
 	case TFLOAT32:
 		p1->as = AMOVSS;
 		break;
@@ -1180,7 +1179,6 @@ 		break;
 
 	case TFLOAT32:
 	case TFLOAT64:
-	case TFLOAT:
 		i = BtoF(~b);
 		if(i && r->cost > 0) {
 			r->regno = i;
diff --git a/src/cmd/8g/cgen.c b/src/cmd/8g/cgen.c
index 875d434fa79b336d108a2398efd3abfe07027336..9c326e8ef1a95e27c63c05d4dafec1b5ef9344fa 100644
--- a/src/cmd/8g/cgen.c
+++ b/src/cmd/8g/cgen.c
@@ -174,7 +174,7 @@ 		break;
 
 	case OREAL:
 	case OIMAG:
-	case OCMPLX:
+	case OCOMPLEX:
 		fatal("unexpected complex");
 		return;
 
diff --git a/src/cmd/8g/galign.c b/src/cmd/8g/galign.c
index 1c14dfe471a6bc545e3b3726edeaaf4b1cc887ce..48edfdf3cc124c1b45994285b460874230c21695 100644
--- a/src/cmd/8g/galign.c
+++ b/src/cmd/8g/galign.c
@@ -17,8 +17,6 @@ {
 	"int",		TINT,		TINT32,
 	"uint",		TUINT,		TUINT32,
 	"uintptr",	TUINTPTR,	TUINT32,
-	"float",	TFLOAT,		TFLOAT32,
-	"complex",	TCOMPLEX,	TCOMPLEX64,
 	0
 };
 
diff --git a/src/cmd/8g/reg.c b/src/cmd/8g/reg.c
index e1dacf55ad96ee47e3bd26d142a619407656904d..1465d372ce2ffd1fcbd0825b2ae113be72defdb7 100644
--- a/src/cmd/8g/reg.c
+++ b/src/cmd/8g/reg.c
@@ -1095,7 +1095,6 @@ 		break;
 
 	case TFLOAT32:
 	case TFLOAT64:
-	case TFLOAT:
 		break;
 	}
 	return 0;
diff --git a/src/cmd/gc/align.c b/src/cmd/gc/align.c
index a3785e8718fbe59a3b3e0a5284576169463be337..ed20e7e8b4e5e4baae8f0a5f902a58134fb37c49 100644
--- a/src/cmd/gc/align.c
+++ b/src/cmd/gc/align.c
@@ -412,11 +412,9 @@ 	isint[TUINTPTR] = 1;
 
 	isfloat[TFLOAT32] = 1;
 	isfloat[TFLOAT64] = 1;
-	isfloat[TFLOAT] = 1;
 
 	iscomplex[TCOMPLEX64] = 1;
 	iscomplex[TCOMPLEX128] = 1;
-	iscomplex[TCOMPLEX] = 1;
 
 	isptr[TPTR32] = 1;
 	isptr[TPTR64] = 1;
diff --git a/src/cmd/gc/const.c b/src/cmd/gc/const.c
index 72e67a63405cd26a928845b92fd8a3022e998c14..0ee693c025b2a2831512e5adffac6bc5d99ae972 100644
--- a/src/cmd/gc/const.c
+++ b/src/cmd/gc/const.c
@@ -980,10 +980,10 @@ 	case CTINT:
 		n->type = types[TINT];
 		goto num;
 	case CTFLT:
-		n->type = types[TFLOAT];
+		n->type = types[TFLOAT64];
 		goto num;
 	case CTCPLX:
-		n->type = types[TCOMPLEX];
+		n->type = types[TCOMPLEX128];
 		goto num;
 	num:
 		if(t != T) {
@@ -1034,13 +1034,13 @@ 	}
 	if(!force)
 		return;
 	if(isconst(l, CTCPLX) || isconst(r, CTCPLX)) {
-		convlit(lp, types[TCOMPLEX]);
-		convlit(rp, types[TCOMPLEX]);
+		convlit(lp, types[TCOMPLEX128]);
+		convlit(rp, types[TCOMPLEX128]);
 		return;
 	}
 	if(isconst(l, CTFLT) || isconst(r, CTFLT)) {
-		convlit(lp, types[TFLOAT]);
-		convlit(rp, types[TFLOAT]);
+		convlit(lp, types[TFLOAT64]);
+		convlit(rp, types[TFLOAT64]);
 		return;
 	}
 	convlit(lp, types[TINT]);
diff --git a/src/cmd/gc/cplx.c b/src/cmd/gc/cplx.c
index e25f3cabb91b95f515d9d8132e591748029eb079..3ec9fe5a2c6b537222dd9b563333b3f28a4a1184 100644
--- a/src/cmd/gc/cplx.c
+++ b/src/cmd/gc/cplx.c
@@ -84,7 +84,7 @@ 	case OADD:
 	case OSUB:
 	case OMUL:
 	case OMINUS:
-	case OCMPLX:
+	case OCOMPLEX:
 	case OREAL:
 	case OIMAG:
 		goto yes;
@@ -120,7 +120,7 @@ 	}
 
 	// pick off float/complex opcodes
 	switch(n->op) {
-	case OCMPLX:
+	case OCOMPLEX:
 		if(res->addable) {
 			subnode(&n1, &n2, res);
 			tempname(&tmp, n1.type);
@@ -195,7 +195,7 @@ 	case OADD:
 	case OSUB:
 	case OMUL:
 	case OMINUS:
-	case OCMPLX:
+	case OCOMPLEX:
 	case OREAL:
 	case OIMAG:
 		break;
diff --git a/src/cmd/gc/go.h b/src/cmd/gc/go.h
index ee31a335756f3e43c1f289bdb93b6373d30578bf..b2d025b787f2c5f2d7150c88255076db68de2f71 100644
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -390,7 +390,7 @@ 	ORECV,
 	ORUNESTR,
 	OSELRECV,
 	OIOTA,
-	OREAL, OIMAG, OCMPLX,
+	OREAL, OIMAG, OCOMPLEX,
 
 	// stmts
 	OBLOCK,
@@ -440,11 +440,9 @@ 	TINT, TUINT, TUINTPTR,
 
 	TCOMPLEX64,		// 12
 	TCOMPLEX128,
-	TCOMPLEX,
 
 	TFLOAT32,		// 15
 	TFLOAT64,
-	TFLOAT,
 
 	TBOOL,			// 18
 
diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 0f1acd2fcdab7a61b1958eea216d974e0a903819..45b1257fad0b4df75e214cb4837c4cf3d22a96b2 100644
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -1531,7 +1531,7 @@ 	"append",		LNAME,		Txxx,		OAPPEND,
 	"cap",		LNAME,		Txxx,		OCAP,
 	"close",	LNAME,		Txxx,		OCLOSE,
 	"closed",	LNAME,		Txxx,		OCLOSED,
-	"cmplx",	LNAME,		Txxx,		OCMPLX,
+	"complex",	LNAME,		Txxx,		OCOMPLEX,
 	"copy",		LNAME,		Txxx,		OCOPY,
 	"imag",		LNAME,		Txxx,		OIMAG,
 	"len",		LNAME,		Txxx,		OLEN,
diff --git a/src/cmd/gc/print.c b/src/cmd/gc/print.c
index 6bb1f026befd8efba23949c3e1c3664028e65646..25c4126397d65cb06773c03e63c6d3c731d072d2 100644
--- a/src/cmd/gc/print.c
+++ b/src/cmd/gc/print.c
@@ -365,8 +365,8 @@ 			fmtprint(f, "...");
 		fmtprint(f, ")");
 		break;
 
-	case OCMPLX:
-		fmtprint(f, "cmplx(");
+	case OCOMPLEX:
+		fmtprint(f, "complex(");
 		exprfmt(f, n->left, 0);
 		fmtprint(f, ", ");
 		exprfmt(f, n->right, 0);
diff --git a/src/cmd/gc/reflect.c b/src/cmd/gc/reflect.c
index b31eb51549283da363254f66730da2487f5be86e..36c245d4782e3bd3c33dcd07bc8156a3d3a07355 100644
--- a/src/cmd/gc/reflect.c
+++ b/src/cmd/gc/reflect.c
@@ -419,10 +419,8 @@ 	KindUint16,
 	KindUint32,
 	KindUint64,
 	KindUintptr,
-	KindFloat,
 	KindFloat32,
 	KindFloat64,
-	KindComplex,
 	KindComplex64,
 	KindComplex128,
 	KindArray,
@@ -453,7 +451,6 @@ 	[TUINT32]	= KindUint32,
 	[TINT64]	= KindInt64,
 	[TUINT64]	= KindUint64,
 	[TUINTPTR]	= KindUintptr,
-	[TFLOAT]	= KindFloat,
 	[TFLOAT32]	= KindFloat32,
 	[TFLOAT64]	= KindFloat64,
 	[TBOOL]		= KindBool,
@@ -466,7 +463,6 @@ 	[TCHAN]		= KindChan,
 	[TMAP]		= KindMap,
 	[TARRAY]		= KindArray,
 	[TFUNC]		= KindFunc,
-	[TCOMPLEX]	= KindComplex,
 	[TCOMPLEX64]	= KindComplex64,
 	[TCOMPLEX128]	= KindComplex128,
 };
@@ -485,10 +481,8 @@ 	[TUINT32]	= "*runtime.UintType",
 	[TINT64]	= "*runtime.IntType",
 	[TUINT64]	= "*runtime.UintType",
 	[TUINTPTR]	= "*runtime.UintType",
-	[TCOMPLEX]	= "*runtime.ComplexType",
 	[TCOMPLEX64]	= "*runtime.ComplexType",
 	[TCOMPLEX128]	= "*runtime.ComplexType",
-	[TFLOAT]	= "*runtime.FloatType",
 	[TFLOAT32]	= "*runtime.FloatType",
 	[TFLOAT64]	= "*runtime.FloatType",
 	[TBOOL]		= "*runtime.BoolType",
@@ -542,7 +536,6 @@ 	case TUINT32:
 	case TINT64:
 	case TUINT64:
 	case TUINTPTR:
-	case TFLOAT:
 	case TFLOAT32:
 	case TFLOAT64:
 	case TBOOL:
diff --git a/src/cmd/gc/sinit.c b/src/cmd/gc/sinit.c
index 19ee3327b430aa3e19f343ba2ebf096ba3a6c400..be96a1477a25d6619e35ce131b3add2e455d3f93 100644
--- a/src/cmd/gc/sinit.c
+++ b/src/cmd/gc/sinit.c
@@ -917,14 +917,12 @@ 	case TPTR32:
 	case TPTR64:
 	case TFLOAT32:
 	case TFLOAT64:
-	case TFLOAT:
 		gused(N); // in case the data is the dest of a goto
 		gdata(&nam, nr, nr->type->width);
 		break;
 
 	case TCOMPLEX64:
 	case TCOMPLEX128:
-	case TCOMPLEX:
 		gused(N); // in case the data is the dest of a goto
 		gdatacomplex(&nam, nr->val.u.cval);
 		break;
diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index 3c450109629de46d5f910aed5996d09957b6b32b..cb5e2a831d9908042b2c2e7197bf1ebd2529ca8a 100644
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -836,7 +836,7 @@ 	[OCAP]		= "cap",
 	[OCASE]		= "case",
 	[OCLOSED]	= "closed",
 	[OCLOSE]	= "close",
-	[OCMPLX]	= "cmplx",
+	[OCOMPLEX]	= "complex",
 	[OCOM]		= "^",
 	[OCONTINUE]	= "continue",
 	[OCOPY]		= "copy",
@@ -993,10 +993,8 @@ 	[TUINT32]	= "UINT32",
 	[TINT64]	= "INT64",
 	[TUINT64]	= "UINT64",
 	[TUINTPTR]	= "UINTPTR",
-	[TFLOAT]	= "FLOAT",
 	[TFLOAT32]	= "FLOAT32",
 	[TFLOAT64]	= "FLOAT64",
-	[TCOMPLEX]	= "COMPLEX",
 	[TCOMPLEX64]	= "COMPLEX64",
 	[TCOMPLEX128]	= "COMPLEX128",
 	[TBOOL]		= "BOOL",
@@ -1117,10 +1115,8 @@ 	[TUINT32]	= "uint32",
 	[TINT64]	= "int64",
 	[TUINT64]	= "uint64",
 	[TUINTPTR]	= "uintptr",
-	[TFLOAT]	= "float",
 	[TFLOAT32]	= "float32",
 	[TFLOAT64]	= "float64",
-	[TCOMPLEX]	= "complex",
 	[TCOMPLEX64]	= "complex64",
 	[TCOMPLEX128]	= "complex128",
 	[TBOOL]		= "bool",
@@ -1752,8 +1748,6 @@ int
 cplxsubtype(int et)
 {
 	switch(et) {
-	case TCOMPLEX:
-		return TFLOAT;
 	case TCOMPLEX64:
 		return TFLOAT32;
 	case TCOMPLEX128:
diff --git a/src/cmd/gc/typecheck.c b/src/cmd/gc/typecheck.c
index ca114d47cdc637129e1b6bfcb9bcb3c883ed835e..88e0fc0136e1abb48efbf3699d8b364c38c5cb66 100644
--- a/src/cmd/gc/typecheck.c
+++ b/src/cmd/gc/typecheck.c
@@ -852,7 +852,7 @@ 		}
 		n->type = types[TINT];
 		goto ret;
 
-	case OCMPLX:
+	case OCOMPLEX:
 		ok |= Erv;
 		if(twoarg(n) < 0)
 			goto error;
@@ -865,7 +865,7 @@ 		n->left = l;
 		n->right = r;
 		if(l->type->etype != r->type->etype) {
 		badcmplx:
-			yyerror("invalid operation: %#N (cmplx of types %T, %T)", n, l->type, r->type);
+			yyerror("invalid operation: %#N (complex of types %T, %T)", n, l->type, r->type);
 			goto error;
 		}
 		switch(l->type->etype) {
@@ -873,9 +873,6 @@ 		default:
 			goto badcmplx;
 		case TIDEAL:
 			t = types[TIDEAL];
-			break;
-		case TFLOAT:
-			t = types[TCOMPLEX];
 			break;
 		case TFLOAT32:
 			t = types[TCOMPLEX64];
diff --git a/src/cmd/gc/walk.c b/src/cmd/gc/walk.c
index 1d4c5a58e39388b45c40a067bafad99ac5b891ac..8b89d9ee49a2eefe2c70262e68be2a23260ba006 100644
--- a/src/cmd/gc/walk.c
+++ b/src/cmd/gc/walk.c
@@ -671,7 +671,7 @@ 	case OLE:
 	case OGE:
 	case OGT:
 	case OADD:
-	case OCMPLX:
+	case OCOMPLEX:
 		walkexpr(&n->left, init);
 		walkexpr(&n->right, init);
 		goto ret;
diff --git a/src/cmd/ld/dwarf.c b/src/cmd/ld/dwarf.c
index 506c6e5db8ddf0751e2e3529d57cf2f31590e830..4683f806fa124482c0e7ca4b7b6fc7c61b442dfa 100644
--- a/src/cmd/ld/dwarf.c
+++ b/src/cmd/ld/dwarf.c
@@ -768,10 +768,8 @@ 	KindUint16,
 	KindUint32,
 	KindUint64,
 	KindUintptr,
-	KindFloat,
 	KindFloat32,
 	KindFloat64,
-	KindComplex,
 	KindComplex64,
 	KindComplex128,
 	KindArray,
@@ -1049,7 +1047,6 @@ 		newattr(die, DW_AT_encoding,  DW_CLS_CONSTANT, DW_ATE_unsigned, 0);
 		newattr(die, DW_AT_byte_size, DW_CLS_CONSTANT, bytesize, 0);
 		break;
 
-	case KindFloat:
 	case KindFloat32:
 	case KindFloat64:
 		die = newdie(&dwtypes, DW_ABRV_BASETYPE, name);
@@ -1057,7 +1054,6 @@ 		newattr(die, DW_AT_encoding,  DW_CLS_CONSTANT, DW_ATE_float, 0);
 		newattr(die, DW_AT_byte_size, DW_CLS_CONSTANT, bytesize, 0);
 		break;
 
-	case KindComplex:
 	case KindComplex64:
 	case KindComplex128:
 		die = newdie(&dwtypes, DW_ABRV_BASETYPE, name);