Introduce better naming consistency for some union members.  remove type
prefix from a typedef.