Refactoring BlockIds.DialHomeDevice/BlockIds.DialHomeDeviceBasic to match everything else