Some renaming, added more restaurants