More renaming, as per issue #20.