Removed old stuff and updated to new name.