Modify titles as suggested by Jerome