Some renames for consistency and to make sense.
Merge pull request #421 from ambiata/topic/renames

Some renames for consistency and to make sense.