Renamed common.props to cpp.props.