Fix some deprecation warnings caused by renames
Merge pull request #1653 from def-/name-fixes-2

Fix some deprecation warnings caused by renames