Change name
Add titles
Merge branch 'hotfix/titles'