class name refactor
finish nameed query