Fixed some naming bugs.