rename/refactor to avoid shadowing version() functions
Merge pull request #5078 from hulu/version-shadowing

rename/refactor to avoid shadowing version() functions