Changes based on review

And some renaming refactoring to boot.