Some renaming, dependency specs