Headers update
Header update + Class name rename