Better names for scope timer classes
Revert "Better names for scope timer classes"

This reverts commit 6435465230145b978b97cfbc175e52279b9e0b54.