rename map/marker to map/popup