Rename encryption fields and move them to the same row