project names refactor (with order)