Bug 1033686 - Part 2: Rename files.
Bug 1033686 - Part 3: Add Yahoo agent.