refactor: rename types (more consistent style)