Refactor away from type name 'heredoc' in method names