Update to reflect new (hopefully final) name