Generator: interface dropped, HtmlGenerator renamed to Generator