Issue #2: use the old widget class names for backward compatibility :/