Message modifications, part 2

* Rename many keys.
* Modify some messages to now include numbers in arguments.
* Done with formats, start keywords.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>