How about update all the specs to the new style in another PR?