refctoring class names