fixed some naming bugs