Generator: dropped interface
HtmlGenerator renamed to Generator