diff --git a/src/plotrecipes.jl b/src/plotrecipes.jl
index 71fa99c84..454567911 100644
--- a/src/plotrecipes.jl
+++ b/src/plotrecipes.jl
@@ -23,10 +23,10 @@ end
     elseif sertype in [:histogram, :stephist, :density, :barhist, :scatterhist, :ea_histogram]
         HistogramLike(), Afwd
     elseif sertype in [:hline]
-        :ylabel --> label(Afwd)
+        :yguide --> label(Afwd)
         data(Afwd)
     elseif sertype in [:vline, :andrews]
-        :xlabel --> label(Afwd)
+        :xguide --> label(Afwd)
         data(Afwd)
     elseif sertype in [:violin, :dotplot, :boxplot]
         ViolinLike(), Afwd
@@ -40,15 +40,15 @@ end
 
 @recipe function f(::SeriesLike, A::AbstractArray{T,1}) where T
     dim = dims(A, 1)
-    :ylabel --> label(A)
-    :xlabel --> label(dim)
+    :xguide --> label(dim)
+    :yguide --> label(A)
     unwrap(index(dim)), parent(A)
 end
 @recipe function f(::SeriesLike, A::AbstractArray{T,2}) where T
     A = maybe_permute(A, (IndependentDim, DependentDim))
     ind, dep = dims(A)
-    :xlabel --> label(ind)
-    :ylabel --> label(A)
+    :xguide --> label(ind)
+    :yguide --> label(A)
     :legendtitle --> label(dep)
     :labels --> permutedims(index(dep))
     index(ind), data(A)
@@ -56,13 +56,13 @@ end
 
 @recipe function f(::HistogramLike, A::AbstractArray{T,1}) where T
     dim = dims(A, 1)
-    :xlabel --> label(A)
+    :xguide --> label(A)
     index(dim), data(A)
 end
 @recipe function f(::HistogramLike, A::AbstractArray{T,2}) where T
     A = maybe_permute(A, (IndependentDim, DependentDim))
     ind, dep = dims(A)
-    :xlabel --> label(A)
+    :xguide --> label(A)
     :legendtitle --> label(dep)
     :labels --> permutedims(index(dep))
     index(ind), data(A)
@@ -70,14 +70,14 @@ end
 
 @recipe function f(::ViolinLike, A::AbstractArray{T,1}) where T
     dim = dims(A, 1)
-    :ylabel --> label(A)
+    :yguide --> label(A)
     data(A)
 end
 @recipe function f(::ViolinLike, A::AbstractArray{T,2}) where T
     A = maybe_permute(A, (IndependentDim, DependentDim))
     ind, dep = dims(A)
-    :xlabel --> label(dep)
-    :ylabel --> label(A)
+    :xguide --> label(dep)
+    :yguide --> label(A)
     :legendtitle --> label(dep)
     :labels --> permutedims(index(dep))
     data(A)
@@ -85,19 +85,19 @@ end
 
 @recipe function f(::HeatMapLike, A::AbstractArray{T,1}) where T
     dim = dims(A, 1)
-    :xlabel --> label(dim)
-    :ylabel --> label(A)
+    :xguide --> label(dim)
+    :yguide --> label(A)
     index(dim), data(A)
 end
 
 @recipe function f(::HeatMapLike, A::AbstractArray{T,2}) where T
     A = maybe_permute(A, (YDim, XDim))
     y, x = dims(A)
-    :xlabel --> label(x)
-    :ylabel --> label(y)
-    :zlabel --> label(A)
+    :xguide --> label(x)
+    :yguide --> label(y)
+    :zguide --> label(A)
     :colorbar_title --> label(A)
-    data(A)
+    reverse(map(index, dims(A)))..., data(A)
 end
 
 @recipe function f(::ImageLike, A::AbstractArray{T,2}) where T
diff --git a/test/plotrecipes.jl b/test/plotrecipes.jl
index 09b681600..71519441f 100644
--- a/test/plotrecipes.jl
+++ b/test/plotrecipes.jl
@@ -10,7 +10,6 @@ sticks(da1)
 histogram(da1)
 stephist(da1)
 barhist(da1)
-heatmap(da1)
 scatterhist(da1)
 histogram2d(da1)
 hline(da1)
@@ -48,7 +47,6 @@ histogram2d(da2)
 hline(da2)
 vline(da2)
 plot(da2; seriestype=:line)
-# Don't display dims currently
 heatmap(da2)
 contour(da2)
 wireframe(da2)