Rename some interfaces