Improve titles

- note I couldn't get tests to run on my side so some tests might need updating.