Renamed some of the stuff for just a fun of it.