fix for issues involving a refactor and rename