Reenable commented out code
Rename proj1↦first, proj2↦second in clients

A followup to 9d0be1112d75970c739ca77054ba0676a7754aee.