Rename +
Revert "Heatmaps Refactoring"

This reverts commit 53fb10dba62c38cac0da75f8b2d57d7beb3a5f52.