more global renaming
grouping lstat's
more unified