Some minor renames
Code cleanup according to code analysis messages