Fixing calls after naming convention change