20140624 - change yahoo naming convention