Applied fixes to updater and renamed some functions