Standardise device names
Add socket mode cache
Merge conflict