factor debug-name cleaning into a separate function