renaming modules / classes to avoid deprecation errors