generator: naming cleanup
gtk: update