Correct method names.
Merge branch 'master' into freelists