Fix for incorrectly named classes
Corrected spelling in Matrix code.
Removed self args