Fixed some naming bugs