[ci skip]
This change aims to make class names shorter with less redundant fully qualified names. Merge!