diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 88f11420..5f5b5860 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -1,6 +1,6 @@
{% extends 'groups/layout.html' %}
{% load i18n %}
-{% load bookwyrm_group_tags %}
+{% load group_tags %}
{% load markdown %}
{% block panel %}
diff --git a/bookwyrm/templates/groups/layout.html b/bookwyrm/templates/groups/layout.html
index a25c1085..e688bc77 100644
--- a/bookwyrm/templates/groups/layout.html
+++ b/bookwyrm/templates/groups/layout.html
@@ -1,6 +1,6 @@
{% extends 'layout.html' %}
{% load i18n %}
-{% load bookwyrm_group_tags %}
+{% load group_tags %}
{% block title %}{{ group.name }}{% endblock %}
diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html
index 1d1ac314..90236843 100644
--- a/bookwyrm/templates/groups/members.html
+++ b/bookwyrm/templates/groups/members.html
@@ -1,7 +1,7 @@
{% load i18n %}
{% load utilities %}
{% load humanize %}
-{% load bookwyrm_group_tags %}
+{% load group_tags %}
Group Members
{% if group.user == request.user %}
diff --git a/bookwyrm/templates/lists/embed-list.html b/bookwyrm/templates/lists/embed-list.html
index 9c07291c..ec4a9162 100644
--- a/bookwyrm/templates/lists/embed-list.html
+++ b/bookwyrm/templates/lists/embed-list.html
@@ -1,7 +1,7 @@
{% extends 'embed-layout.html' %}
{% load i18n %}
{% load rating_tags %}
-{% load bookwyrm_group_tags %}
+{% load group_tags %}
{% load markdown %}
{% block title %}{% blocktrans with list_name=list.name owner=list.user.display_name %}{{ list_name }}, a list by {{owner}}{% endblocktrans %}{% endblock title %}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index eb351df3..b77f935c 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,7 +1,7 @@
{% extends 'lists/layout.html' %}
{% load i18n %}
{% load rating_tags %}
-{% load bookwyrm_group_tags %}
+{% load group_tags %}
{% load markdown %}
{% block breadcrumbs %}
diff --git a/bookwyrm/templates/snippets/add_to_group_button.html b/bookwyrm/templates/snippets/add_to_group_button.html
index 2785d7c0..20194623 100644
--- a/bookwyrm/templates/snippets/add_to_group_button.html
+++ b/bookwyrm/templates/snippets/add_to_group_button.html
@@ -1,5 +1,6 @@
{% load i18n %}
-{% load bookwyrm_group_tags %}
+{% load group_tags %}
+
{% if request.user == user or not request.user == group.user or not request.user.is_authenticated %}
{% elif user in request.user.blocks.all %}
{% include 'snippets/block_button.html' with blocks=True %}
diff --git a/bookwyrm/templates/snippets/join_invitation_buttons.html b/bookwyrm/templates/snippets/join_invitation_buttons.html
index 46c4071d..b77ce43c 100644
--- a/bookwyrm/templates/snippets/join_invitation_buttons.html
+++ b/bookwyrm/templates/snippets/join_invitation_buttons.html
@@ -1,5 +1,6 @@
{% load i18n %}
-{% load bookwyrm_group_tags %}
+{% load group_tags %}
+
{% if group|is_invited:request.user %}