Fixing uses
Normalizing class name