fixed some naming issue