entree: Rename typedefs for consistency

BUG: assign static members on each entry