Rename, doc fix