Rename, remove references to Sink