Fix issues with confusing axis names and expectations