Renamed things for consistency, added nice images