Rename type to make naming more consistent