improved namechanger (again)