Minor fixes

Fixes some references and bad file name (It didn't have the same name as the class)