fix class naming issue