Using more sensical names.
Updated README to reflect recent name changes.