small renaming and working on device status