Comments addressed
Some renames