renaming to match WF app control names