Fixing the classes' names. They didn't changed in previous commits