Code cleanup due to https://github.com/Gomasy/update_name/commit/ccde874bcfb19a748ba558a88edd6d6b68bc98ce