Replaced builtin names with leading-underscore names in util.py to avoid any funny business, added many test cases for repo sync with version number.