Remove use of deprecated datamodel classes in \api

Change-Id: I56d92ec8d51eac7ebd24b1f48ef550042a216677