Renaming.
Fixed some naming. Better proof for completeness.