Some API renaming for schema construction