Some methods and variables renamed.