some class names are more readable (yeah, class rename again)
fix conflits