Fixed issues with refactor when changed names