ambiata/ivory — pull request #421 by markhibberd (2014-11-04 12:56:18+00:00)
Title: Some renames for consistency and to make sense.

Hopefully not controversial.