Fixed mapping that was not pointing to the right methods (after renaming).