Change from device claim to use claim