use more standardized names for dimension queries