DDBEXTRA-278: var names changed