Fixes deprecation warnings to return the correct name for the deprecated function.
Merge pull request #208 from ajorgensen/null_deprecated_fix

Fixes deprecation warnings