Change method names
Update common