changing to stl naming convention