Renamed poloroid_olivia
Updated Witness to use constant names