refactor classname to be consistent