Rename some variables.

Tweak: Fix lack of alpha-conversion on horizontal frame.