Renaming, update deps