More rename fixes.