Improve pivot & rename.