Fixed naming

Updated naming convention and titles.