diff --git a/cypress/README.md b/cypress/README.md
index a98b6f514..662d0b51c 100644
--- a/cypress/README.md
+++ b/cypress/README.md
@@ -16,12 +16,6 @@ First, you have to tell cypress how to connect to your local neo4j database
 among other things. You can copy our template configuration and change the new
 file according to your needs.
 
-Make sure you are at the root level of the project. Then:
-```bash
-# in the top level folder Human-Connection/
-$ cp cypress.env.template.json cypress.env.json
-```
-
 To start the services that are required for cypress testing, run:
 
 ```bash
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index 94aa3a841..9e0cc799b 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -256,7 +256,7 @@ When("I choose {string} as the language for the post", (languageCode) => {
 
 Then("the post shows up on the landing page at position {int}", index => {
   cy.openPage("landing");
-  const selector = `.hc-post-card:nth-child(${index}) > .ds-card-content`;
+  const selector = `.post-card:nth-child(${index}) > .ds-card-content`;
   cy.get(selector).should("contain", lastPost.title);
   cy.get(selector).should("contain", lastPost.content);
 });
@@ -271,11 +271,11 @@ Then("the post was saved successfully", () => {
 });
 
 Then(/^I should see only ([0-9]+) posts? on the landing page/, postCount => {
-  cy.get(".hc-post-card").should("have.length", postCount);
+  cy.get(".post-card").should("have.length", postCount);
 });
 
 Then("the first post on the landing page has the title:", title => {
-  cy.get(".hc-post-card:first").should("contain", title);
+  cy.get(".post-card:first").should("contain", title);
 });
 
 Then(
diff --git a/webapp/components/PostCard/PostCard.vue b/webapp/components/PostCard/PostCard.vue
index 04af36fcb..846636bb7 100644
--- a/webapp/components/PostCard/PostCard.vue
+++ b/webapp/components/PostCard/PostCard.vue
@@ -3,7 +3,7 @@
     :lang="post.language"
     :image="post.image | proxyApiUrl"
     :class="{
-      'hc-post-card': true,
+      'post-card': true,
       'disabled-content': post.disabled,
       '--pinned': isPinned,
       '--blur-image': post.imageBlurred,
@@ -157,7 +157,7 @@ export default {
 }
 </script>
 <style lang="scss">
-.hc-post-card {
+.post-card {
   justify-content: space-between;
   position: relative;
   z-index: 1;
diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue
index 89c2cd547..0b90c11ae 100644
--- a/webapp/components/UserTeaser/UserTeaser.vue
+++ b/webapp/components/UserTeaser/UserTeaser.vue
@@ -151,7 +151,7 @@ export default {
 .user-teaser {
   display: flex;
   flex-wrap: nowrap;
-  z-index: $z-index-hc-post-card-link;
+  z-index: $z-index-post-card-link;
   position: relative;
 
   > .user-info {
diff --git a/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js b/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
index f18bc6756..77f7909a0 100644
--- a/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
+++ b/webapp/components/_new/generic/UserAvatar/UserAvatar.spec.js
@@ -19,7 +19,6 @@ describe('UserAvatar.vue', () => {
     expect(wrapper.find('img').exists()).toBe(false)
   })
 
-  // this is testing the style guide
   it('renders an icon', () => {
     expect(wrapper.find(BaseIcon).exists()).toBe(true)
   })