Update for name change and assets changes