Naming and comment fixes.