rename to avoid shadowing built-in type 'type'
Merge pull request #5065 from hulu/type-shadowing

rename to avoid shadowing built-in type 'type'