Fixed some naming issue for the latest stl