adjusted class references for headers