Better file names
STL cleanups