Fix file accidentally renaming, from Mayhem
Close #179
Close #168
Close #172