Trivial rename/code move.