Rename some classes according to STL naming convention