This withstands naming/renaming issues.
Merge pull request #1868 from seanhandley/fix_issue_1414

This withstands naming/renaming issues.