Name change and a bunch of updates