Change naming to avoid curate confusion