Added category uppercase / capital case changes throughout core