Adds back Scala notation in the outline labels

Partial revert of 21f15b9aa570ec6730b8fdd9176f2f616a5534f8

Fixes #1002339