Tweak class long-name selection