No more name-labeling.

No more name-labeling.