Use type literals rather than hard coded type names