rename classes to be more transparent