Fix some deprecation warnings caused by renames

Should merge automatically now.