I think slug makes more sense. I'll remove the TODOs, since the existing URLs have used slugs.