Cleanup Node naming