Fixed up some naming problems and rearranged some graphics headers