Renamed some stuff, trimmed down the generated output