Renaming file and the folder containing it at the same time

I have created a renaming rule such that files/folders in the format Prefix.Date.Suffix are renamed to Prefix-Date-Suffix and then moved to a folder.
This rule works fine except in instances where a folder within the monitored folder and the file within it both have the same name. For example, if I have a folder named "Hi.17.12.23.Bye" and a file named "Hi.17.12.23.Bye.txt" within it then, based on how I have placed the Process subfolders rule, either the folder or the file are renamed. I would like for both to be renamed at the same time instead of in different passes, which does happen. I have played around with a ton of different options but can't get this to happen. Here is my rule. Thanks for your help!
https://www.dropbox.com/s/rkj640nlcz17p ... rules?dl=0
This rule works fine except in instances where a folder within the monitored folder and the file within it both have the same name. For example, if I have a folder named "Hi.17.12.23.Bye" and a file named "Hi.17.12.23.Bye.txt" within it then, based on how I have placed the Process subfolders rule, either the folder or the file are renamed. I would like for both to be renamed at the same time instead of in different passes, which does happen. I have played around with a ton of different options but can't get this to happen. Here is my rule. Thanks for your help!
https://www.dropbox.com/s/rkj640nlcz17p ... rules?dl=0