Fixed classes names.