To correspond to prevous changes. To be more intuitive.
Large naming refactoring. Added some more tests.