Revert "change s to scanner"

This reverts commit 4fc44b3fd35e9a79469e710c32ef8a3f2726035f.