Nomenclature improvements.
A lot of changes and improvements.

And some laziness when it comes to commit messages ;)