Switched from shadowing to handler overriding in Custom Unit Names to make it play better with updates.