Rename stuff, clean code