Fixed popup.c naming conflict