Reflecting name change, clarified a few details.