Cleanup naming routes