Ctrl factory bug fix from renaming