More cleaning: make class names better reflecting their properties