Rename stuff
more checks