Name fix and change to 24 hours check