Fix: Wrong name displayed - popup