Rename common to base