Support NUCCORE-1127, schema prop renames