Finished renaming. Some of the tests fail. Fix later