Fixed some incorrect names.