Use proper names for scroll metric properties

(Split out from #139.)