Thanks Adoby..
Sorry, guess I wasn't clear again
I don't mess around Calibre folders. I usually copy the ePub and PDF files from Calibre folders to my folders and THEN rename them. So I leave Calibre naming as it while making changes on my copied files.