Here's my 2 cents
Instead of changing the PS templates, I would suggest creating your own templates with your own naming convention.
I did this and it took me less than a day to bring up a website with PS using a totally different look and feel.
Started it yesterday and now I'm just doing little clean up here and there and adding products.
I have to admit, getting your head around the PS product takes a little bit (not much) but once you do, you see the real power in the product. Yes, it has a few quirks that will get worked out in further versions hopefully, but after you start working with PS, the world becomes much easier.
Great job WebAsssist.