JCLOUDS-356: clearer variable naming