rename stuff
removed sf