Some methods names changed.