Fixed a few wrong calls to functions that were renamed