Renaming categories for tracked devices.
StateMachine sorts states now case insesitive
Added missing doc-string