FIX: class name refactoring