How do you organize your (own) music library?

I’ve been approached by a music library who wants to put my tracks on their site. Sure, why not? The problem is some of my tracks have names like “lightning bug” and some are labeled like “2M06” if it was for a project.

How do you organize your music library? Do you rename all your tracks in a specific way or leave them named as you originally had them and add tags in a program like sound miner? So far, I’ve only separated tracks by genre.