Fix bug for deviceNameTbale persistency.
Delete the Entry inner class.