Update naming as part of cleanup.