Smart fix filenames

Question

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. How do i do this? I'm using Photoshop Elements 11 and am inexperienced with the package.

Answer 1

Select all the images Original and Edited
Add a Keyword tag (Say "X") to all
Now In the search text box, type Edited.
This will give you all the files which are the edited ones with names appended with "Edited-1"
Now add all these images a unique Tag (Say "Y").
Right click on any of these images and select "Remove Keyword tag from selected images"
and remove "X" from these
Now search the images with Keyword tag -"X"
These all your original files. Delete  them