Clean up popup naming