Fix hyphen/underscore hell in downloader and indexer