Clean up some net names