[JBIDE-14691] remove Express from class names