Shortened a class name
A few final component model renames
Correction to the user guide