Improve naming
Improve naming in Downloader class
Fix whitespace
Fix analyzer to use new naming conventions