Fix for Issue #756 

Fixed incomplete rename refactoring from commit b24c1a1ad9fd