Updated PROGNAME in makefiles to 'bach'
Renamed header guards