Minor fixes
Harmonize base class naming
Add note for demo