diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index f8d07e05a2d3f..422a939380456 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -2121,7 +2121,7 @@ setMethod("arrange",
           })
 
 #' @rdname arrange
-#' @name arrange
+#' @name orderBy
 #' @aliases orderBy,SparkDataFrame,characterOrColumn-method
 #' @export
 #' @note orderBy(SparkDataFrame, characterOrColumn) since 1.4.0
diff --git a/R/pkg/R/WindowSpec.R b/R/pkg/R/WindowSpec.R
index 1f65647dc1cda..751ba3fde954d 100644
--- a/R/pkg/R/WindowSpec.R
+++ b/R/pkg/R/WindowSpec.R
@@ -88,7 +88,7 @@ setMethod("partitionBy",
 #' @param x a WindowSpec
 #' @param col a character or Column object indicating an ordering column
 #' @param ... additional sorting fields
-#' @return A WindowSpec
+#' @return A WindowSpec.
 #' @name orderBy
 #' @rdname orderBy
 #' @aliases orderBy,WindowSpec,character-method
diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
index 10a09129ec927..cd1eb02fbfe7c 100644
--- a/R/pkg/R/generics.R
+++ b/R/pkg/R/generics.R
@@ -551,7 +551,7 @@ setGeneric("merge")
 #' @export
 setGeneric("mutate", function(.data, ...) {standardGeneric("mutate") })
 
-#' @rdname orderBy
+#' @rdname arrange
 #' @export
 setGeneric("orderBy", function(x, col, ...) { standardGeneric("orderBy") })
 
@@ -771,6 +771,10 @@ setGeneric("over", function(x, window) { standardGeneric("over") })
 
 ###################### WindowSpec Methods ##########################
 
+#' @rdname orderBy
+#' @export
+setGeneric("orderBy", function(x, col, ...) { standardGeneric("orderBy") })
+
 #' @rdname rowsBetween
 #' @export
 setGeneric("rowsBetween", function(x, start, end) { standardGeneric("rowsBetween") })