device section name consistency fixes
9 files changed