Added Yeates & Geldzahler; cleaned up Upercase names