Renamed some fields, and added Column(name="X") annotations.