Renamed `peace` type to treaty.

And minor name fix