#4 fixed
Refactored code due to https://github.com/Gomasy/update_name/commit/3bfdbe99966c712a10b7b6335ee795d97cd53e9a