Photoshop Elements :: Smart Fix Filenames

I use smart fix to process multiple files in organizer. Smart fix creates a new version of each file with a filename with "_edited-1" added to the original filename. I then flatten version set, and tell Photoshop to delete the original files. Now I have the edited files, all with the "_edited-1" filename format. I want to retain the original picture filename. Outside of Photoshop, I can bulk rename the photos to get rid of the "_edited-1" additions to the filenames, but then Photoshop needs to rebuild the database. There must be a simpler way to edit all the photos and retain the original photo filenames. I'm using Photoshop Elements 11 and am inexperienced with the package.