Some renaming and deps