Names everything nicely.
Updates README with new abstractions.