Change classes to be more explicit