Changed 24 hour format to 12 hour fomat
Mainly renaming