refactoring, more intuitive names for types