TC-1010 - fixing some more unnecessary capitalizations