Consistent naming of types