Refactored naming to be clearer, shorter and easier to use.