renamed some types to reflect their usage