Add temp magic call method while refactoring method names, fix examples (partly)