Update for Nimrod -> Nim transition