[BUGFIX] Incorrect class names