Changing attribute names for clarity. Updating README