[fix] popups using the wrong ids/names