Fix comments from rename refactoring