CLIMATE-542: Make variable names more meaningful