When required, also adjusted to use XXXApp.C for the source name.
Adjusted some names in preparation for merge with master.