rename stuff correctly