Merge "Renaming vid-automation #7"