Full rename operation and code clean up

Also removed some connection strings... (yes, I have recycled them!)