File name cleanup and added HB