Change some class name for something more logic