Ongoing upstream name change, plus some metadata improvements