consistent naming
changed headings