More name change fixes