diff --git a/NAMESPACE b/NAMESPACE
index c30cd9c7c..25ea6e706 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,9 +1,9 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(is_fill,default)
-S3method(is_fill,htmlwidget)
-S3method(is_fillable,default)
-S3method(is_fillable,htmlwidget)
+S3method(is_fill_item,default)
+S3method(is_fill_item,htmlwidget)
+S3method(is_fillable_container,default)
+S3method(is_fillable_container,htmlwidget)
 S3method(print,bslib_fragment)
 S3method(print,bslib_page)
 export(accordion)
@@ -15,9 +15,9 @@ export(accordion_panel_remove)
 export(accordion_panel_set)
 export(accordion_panel_update)
 export(as.card_item)
-export(as_fill)
 export(as_fill_carrier)
-export(as_fillable)
+export(as_fill_item)
+export(as_fillable_container)
 export(bootstrap)
 export(bootstrap_sass)
 export(bootswatch_themes)
@@ -70,9 +70,9 @@ export(font_google)
 export(font_link)
 export(is.card_item)
 export(is_bs_theme)
-export(is_fill)
 export(is_fill_carrier)
-export(is_fillable)
+export(is_fill_item)
+export(is_fillable_container)
 export(layout_column_wrap)
 export(layout_sidebar)
 export(nav)
@@ -101,6 +101,7 @@ export(page_fixed)
 export(page_fluid)
 export(page_navbar)
 export(precompiled_css_path)
+export(remove_all_fill)
 export(run_with_themer)
 export(showcase_left_center)
 export(showcase_top_right)
@@ -108,7 +109,6 @@ export(sidebar)
 export(sidebar_toggle)
 export(theme_bootswatch)
 export(theme_version)
-export(undo_fill)
 export(value_box)
 export(version_default)
 export(versions)
diff --git a/R/fill.R b/R/fill.R
index 7f2be48b1..fd86ed4c6 100644
--- a/R/fill.R
+++ b/R/fill.R
@@ -37,7 +37,7 @@ as_fill_carrier <- function(x, ..., min_height = NULL, max_height = NULL, gap =
 
   rlang::check_dots_empty()
 
-  x <- as_fillable(
+  x <- as_fillable_container(
     x, min_height = min_height,
     max_height = max_height,
     gap = gap,
@@ -52,7 +52,7 @@ as_fill_carrier <- function(x, ..., min_height = NULL, max_height = NULL, gap =
 
 #' @rdname as_fill_carrier
 #' @export
-as_fillable <- function(x, ..., min_height = NULL, max_height = NULL, gap = NULL, class = NULL, style = NULL, css_selector = NULL) {
+as_fillable_container <- function(x, ..., min_height = NULL, max_height = NULL, gap = NULL, class = NULL, style = NULL, css_selector = NULL) {
 
   rlang::check_dots_empty()
 
@@ -72,7 +72,7 @@ as_fillable <- function(x, ..., min_height = NULL, max_height = NULL, gap = NULL
 
 #' @rdname as_fill_carrier
 #' @export
-as_fill <- function(x, ..., min_height = NULL, max_height = NULL, class = NULL, style = NULL, css_selector = NULL) {
+as_fill_item <- function(x, ..., min_height = NULL, max_height = NULL, class = NULL, style = NULL, css_selector = NULL) {
 
   rlang::check_dots_empty()
 
@@ -92,7 +92,7 @@ as_fill <- function(x, ..., min_height = NULL, max_height = NULL, class = NULL,
 
 #' @rdname as_fill_carrier
 #' @export
-undo_fill <- function(x) {
+remove_all_fill <- function(x) {
   bindFillRole(
     x, item = FALSE, container = FALSE,
     overwrite = TRUE
@@ -109,35 +109,35 @@ is_fill_carrier <- function(x) {
 
 #' @rdname as_fill_carrier
 #' @export
-is_fillable <- function(x) {
+is_fillable_container <- function(x) {
   UseMethod("is_fillable")
 }
 
 #' @export
-is_fillable.htmlwidget <- function(x) {
+is_fillable_container.htmlwidget <- function(x) {
   # won't actually work until (htmltools#334) gets fixed
   renders_to_tag_class(x, "html-fill-container", ".html-widget")
 }
 
 #' @export
-is_fillable.default <- function(x) {
+is_fillable_container.default <- function(x) {
   renders_to_tag_class(x, "html-fill-container")
 }
 
 #' @rdname as_fill_carrier
 #' @export
-is_fill <- function(x) {
-  UseMethod("is_fill")
+is_fill_item <- function(x) {
+  UseMethod("is_fill_item")
 }
 
 #' @export
-is_fill.htmlwidget <- function(x) {
+is_fill_item.htmlwidget <- function(x) {
   # won't actually work until (htmltools#334) gets fixed
   renders_to_tag_class(x, "html-fill-item", ".html-widget")
 }
 
 #' @export
-is_fill.default <- function(x) {
+is_fill_item.default <- function(x) {
   renders_to_tag_class(x, "html-fill-item")
 }
 
diff --git a/R/sysdata.rda b/R/sysdata.rda
index c001f94cd..f97a55dff 100644
Binary files a/R/sysdata.rda and b/R/sysdata.rda differ
diff --git a/man/as_fill_carrier.Rd b/man/as_fill_carrier.Rd
index 19fe6456e..f960e5103 100644
--- a/man/as_fill_carrier.Rd
+++ b/man/as_fill_carrier.Rd
@@ -2,12 +2,12 @@
 % Please edit documentation in R/fill.R
 \name{as_fill_carrier}
 \alias{as_fill_carrier}
-\alias{as_fillable}
-\alias{as_fill}
-\alias{undo_fill}
+\alias{as_fillable_container}
+\alias{as_fill_item}
+\alias{remove_all_fill}
 \alias{is_fill_carrier}
-\alias{is_fillable}
-\alias{is_fill}
+\alias{is_fillable_container}
+\alias{is_fill_item}
 \title{Test and/or coerce fill behavior}
 \usage{
 as_fill_carrier(
@@ -21,7 +21,7 @@ as_fill_carrier(
   css_selector = NULL
 )
 
-as_fillable(
+as_fillable_container(
   x,
   ...,
   min_height = NULL,
@@ -32,7 +32,7 @@ as_fillable(
   css_selector = NULL
 )
 
-as_fill(
+as_fill_item(
   x,
   ...,
   min_height = NULL,
@@ -42,13 +42,13 @@ as_fill(
   css_selector = NULL
 )
 
-undo_fill(x)
+remove_all_fill(x)
 
 is_fill_carrier(x)
 
-is_fillable(x)
+is_fillable_container(x)
 
-is_fill(x)
+is_fill_item(x)
 }
 \arguments{
 \item{x}{a \code{\link[htmltools:builder]{htmltools::tag()}}.}