Renamed some stuff. Made inspector work.