CLOUD-101 fixed variable names