(change:major) Renamed some classes (use better names)