Fixed some naming issue