[BUGFIX] Do not use deprecated class alias anymore