Crystal Reports 11.5 SP2

I have a set of reports that call on multiple tables. There are multiple formulas in these reports as well.

I need to change my reports to use a SQL command instead of calling on the individual tables.

Typically if I use "Set Data Source Location", I can change Data Sources and the fields and formulas automatically update. But this is when I'm just changing the Database (or DB location). In these cases, the table and field names are still the same.

What I'm trying to do it change the actual query. Which means that the table names change.. ex from "Computer" to "Command". The end result is that I loose all of my field mappings.

Is there a way to get CR to take my new Source query (SQL command) and update all of the fields and formulas to use the new fields?