Update names to reflect Revised conventions