Change variable name accross layers.

Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>