Rename some variable.
Fix method names.