Some minor comment changes and renames