Popup: Improving some more variable names.