Revised all names to header naming convention