Renamings

The remaining renamings...

Visual Studio projects not to be updated soon.