Change some titles

Change full names to shorter names