Switches out symbolic function names to make it more consistent
About to break everything again to compose Reader