Various internal variables have been renamed.