Fix some deprecation warnings because of renames

I don't know if this is wanted or not, fixed the rename warnings I found while running my nimrod-unsorted tests.