BS-2437, remove trace of .bat script + rename them