Corrected macAddress and deviceType