use more sensible names for types