Make the Read/Update class names more clear