Changed a few filenames to have the tox target working fine. Change-Id: Ia0a453449163564249ff293812fffb616bbec7c7