Issue #757 fixed
Search & Replace CUSTOMSW by LOGICALSW
Rename continued