A couple more special cased short names.