Update for name change and fix everything