Renaming a few things and updating the README