More renaming
Leftovers
Towards language equivalence: L to Hyb
Towards language equivalence: L to Hyb, #2