Further renaming...

Minor fixes