But you make having a "rigid naming strategy" sound like a bad thing. That's what I use along with Calvin's versioning script & it works well for me. Filenames essentially become serial numbers & are largely ignored as I'm looking at where the file is in my directory structure, or what categories it's in.

As with most users here I'm looking forward to built-in versioning & stacking in a future update.
_________________________
Chris - Website
180,000 images cataloged & counting
Addict? Who? Me? I can quit any time I want...