More name updataes. I probably should have just automated this.