Change classes names to proper names