Fixed some naming problems.