Either I change the names or update all the packages. I think it makes sense to do the latter unless anyone has any objections?