Rename

@waedt I'd really appreciate if you could review / test this branch on OSX. Thanks