Rename classes
Some minor changes