Renamed, finished up - this closes issue #8