PEP8 renaming of scanner modules
Also rename private methods from leading 2 underscores to 1 to match project coding style