#870: function name changes and comments