Refactor and rename all the things!

Refactored and renamed heavily -  note, thing which are @Deprecated will
be merged/removed in future commits.