diff --git a/cypress/integration/Post.Comment/I_should_see_my_comment.js b/cypress/integration/Post.Comment/I_should_see_my_comment.js
index 356593f9c..8d439b112 100644
--- a/cypress/integration/Post.Comment/I_should_see_my_comment.js
+++ b/cypress/integration/Post.Comment/I_should_see_my_comment.js
@@ -5,7 +5,7 @@ Then("I should see my comment", () => {
     .should("contain", "Ocelot.social rocks")
     .get(".user-teaser span.slug")
     .should("contain", "@peter-pan") // specific enough
-    .get(".user-avatar img")
+    .get(".profile-avatar img")
     .should("have.attr", "src")
     .and("contain", 'https://') // some url
     .get(".user-teaser > .info > .text")
diff --git a/webapp/components/AvatarMenu/AvatarMenu.spec.js b/webapp/components/AvatarMenu/AvatarMenu.spec.js
index 85f5c32a8..8a0c17434 100644
--- a/webapp/components/AvatarMenu/AvatarMenu.spec.js
+++ b/webapp/components/AvatarMenu/AvatarMenu.spec.js
@@ -44,7 +44,7 @@ describe('AvatarMenu.vue', () => {
 
     it('renders the UserAvatar component', () => {
       wrapper.find('.avatar-menu-trigger').trigger('click')
-      expect(wrapper.find('.user-avatar').exists()).toBe(true)
+      expect(wrapper.find('.profile-avatar').exists()).toBe(true)
     })
 
     describe('given a userName', () => {
diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue
index d47eb2d68..3a9bd558a 100644
--- a/webapp/components/AvatarMenu/AvatarMenu.vue
+++ b/webapp/components/AvatarMenu/AvatarMenu.vue
@@ -130,7 +130,7 @@ export default {
   align-items: center;
   padding-left: $space-xx-small;
 
-  > .user-avatar {
+  > .profile-avatar {
     margin-right: $space-xx-small;
   }
 }
diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue
index e80f9fb7d..f884798c7 100644
--- a/webapp/components/UserTeaser/UserTeaser.vue
+++ b/webapp/components/UserTeaser/UserTeaser.vue
@@ -88,7 +88,7 @@ export default {
   display: flex;
   flex-wrap: nowrap;
 
-  > .user-avatar {
+  > .profile-avatar {
     flex-shrink: 0;
   }
 
diff --git a/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js b/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
index 6d12c5ce2..263c40fc9 100644
--- a/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
+++ b/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
@@ -1,10 +1,10 @@
 import { mount } from '@vue/test-utils'
-import UserAvatar from './UserAvatar.vue'
+import UserAvatar from './UserAvatar'
 import BaseIcon from '~/components/_new/generic/BaseIcon/BaseIcon'
 
 const localVue = global.localVue
 
-describe('UserAvatar.vue', () => {
+describe('UserAvatar', () => {
   let propsData, wrapper
   beforeEach(() => {
     propsData = {}
diff --git a/webapp/components/_new/generic/UserAvatar/UserAvatar.vue b/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
index 08ace07c0..7c0279ba5 100644
--- a/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
+++ b/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="['user-avatar', size && `--${this.size}`, !isAvatar && '--no-image']">
+  <div :class="['profile-avatar', size && `--${this.size}`, !isAvatar && '--no-image']">
     <!-- '--no-image' is neccessary, because otherwise we still have a little unwanted boarder araund the image for images with white backgrounds -->
     <span class="initials">{{ userInitials }}</span>
     <base-icon v-if="isAnonymous" name="eye-slash" />
@@ -48,7 +48,7 @@ export default {
 </script>
 
 <style lang="scss">
-.user-avatar {
+.profile-avatar {
   position: relative;
   height: $size-avatar-base;
   width: $size-avatar-base;
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue
index 53da683ce..669e53740 100644
--- a/webapp/pages/group/_id/_slug.vue
+++ b/webapp/pages/group/_id/_slug.vue
@@ -427,7 +427,7 @@ export default {
 </script>
 
 <style lang="scss">
-.profile-page-avatar.user-avatar {
+.profile-page-avatar.profile-avatar {
   margin: auto;
   margin-top: -60px;
 }
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 0dbad0329..471261463 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -417,7 +417,7 @@ export default {
 </script>
 
 <style lang="scss">
-.profile-page-avatar.user-avatar {
+.profile-page-avatar.profile-avatar {
   margin: auto;
   margin-top: -60px;
 }