* Use constant instead of plain key name for device info connections * Some more device info constant changes