remove redundant class name, rename exception