diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68755b50..a687d4ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [1.21.0] - 2023-09-08
+### Changed
+- Change category names. [#1179](https://github.com/rokwire/rokwire-building-blocks-api/issues/1179)
+
 ## [1.20.0] - 2023-09-06
 ### Changed
 - Update Event categories and subcategories list. [#1150](https://github.com/rokwire/rokwire-building-blocks-api/issues/1150)
@@ -599,7 +604,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - References to AWS keys and variables in the Events Building Block.
 
-[Unreleased]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.20.0...HEAD
+[Unreleased]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.21.0...HEAD
+[1.21.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.20.0...1.21.0
 [1.20.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.19.0...1.20.0
 [1.19.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.18.0...1.19.0
 [1.18.0]: https://github.com/rokwire/rokwire-building-blocks-api/compare/1.17.0...1.18.0
diff --git a/SECURITY.md b/SECURITY.md
index 022c7eae..a6d4c107 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,6 +6,7 @@ Patches for **Rokwire Building Blocks** in this repository will only be applied
 
 | Version  | Supported          |
 |----------|--------------------|
+| 1.21.0   | :white_check_mark: |
 | 1.20.0   | :white_check_mark: |
 | 1.19.0   | :white_check_mark: |
 | 1.18.0   | :white_check_mark: |
diff --git a/contributions/catalog/webapps/static/css/style.css b/contributions/catalog/webapps/static/css/style.css
index 5a6381fc..9aabeb94 100644
--- a/contributions/catalog/webapps/static/css/style.css
+++ b/contributions/catalog/webapps/static/css/style.css
@@ -377,8 +377,6 @@ input[type=checkbox]:checked:focus, input[type=checkbox]:not(:checked):focus{
     text-decoration: none;
 }
 
-
-
 .button3 {
     color: white;
     display: inline-block;
diff --git a/eventservice/api/categories.json b/eventservice/api/categories.json
index 37d93be7..7aaf267e 100644
--- a/eventservice/api/categories.json
+++ b/eventservice/api/categories.json
@@ -1,15 +1,15 @@
 [{"category":"Campus Visits"},
 {"category":"Career Development"},
-{"category":"Ceremonies & Services"},
+{"category":"Ceremonies and Services"},
 {"category":"Club Athletics"},
-{"category":"Conferences & Workshops"},
+{"category":"Conferences and Workshops"},
 {"category":"Exhibits"},
-{"category":"Festivals & Celebrations"},
+{"category":"Festivals and Celebrations"},
 {"category":"Film Screenings"},
 {"category":"Performances"},
-{"category":"Receptions & Open House Events"},
-{"category":"Social & Informal Events"},
-{"category":"Speakers & Seminars"},
-{"category":"Big 10 Athletics","subcategories":["Baseball","Men's Basketball","Men's Cross Country","Football","Men's Golf","Men's Gymnastics","Men's Tennis","Men's Track Field","Wrestling","Women's Basketball","Women's Cross Country","Women's Golf","Women's Gymnastics","Women's Soccer","Softball","Swim Dive","Women's Tennis","Women's Track Field","Volleyball"]},
-{"category":"Recreation, Health & Fitness","subcategories":["Group Fitness","Aquatics","Ice Skating","Personal Training","Student Wellness","Adventure Rec","Summer Camp"]}
+{"category":"Receptions and Open House Events"},
+{"category":"Social and Informal Events"},
+{"category":"Speakers and Seminars"},
+{"category":"Big 10 Athletics","subcategories":["Baseball","Men's Basketball","Men's Cross Country","Football","Men's Golf","Men's Gymnastics","Men's Tennis","Men's Track & Field","Wrestling","Women's Basketball","Women's Cross Country","Women's Golf","Women's Gymnastics","Women's Soccer","Softball","Swim & Dive","Women's Tennis","Women's Track & Field","Volleyball"]},
+{"category":"Recreation, Health and Fitness","subcategories":["Group Fitness","Aquatics","Ice Skating","Personal Training","Student Wellness","Adventure Rec","Summer Camp"]}
 ]
diff --git a/eventservice/events.yaml b/eventservice/events.yaml
index 4e7f70eb..555bf8ab 100755
--- a/eventservice/events.yaml
+++ b/eventservice/events.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 info:
   title: Rokwire Events Building Block API
   description: Events Building Block API Documentation
-  version: 1.20.0
+  version: 1.21.0
 servers:
 - url: https://api.rokwire.illinois.edu
   description: Production server
@@ -753,18 +753,18 @@ components:
           enum:
             - Campus Visits
             - Career Development
-            - Ceremonies & Services
+            - Ceremonies and Services
             - Club Athletics
-            - Conferences & Workshops
+            - Conferences and Workshops
             - Exhibits
-            - Festivals & Celebrations
+            - Festivals and Celebrations
             - Film Screenings
             - Performances
-            - Receptions & Open House Events
-            - Social & Informal Events
-            - Speakers & Seminars
+            - Receptions and Open House Events
+            - Social and Informal Events
+            - Speakers and Seminars
             - Big 10 Athletics
-            - Recreation, Health & Fitness
+            - Recreation, Health and Fitness
         subcategory:
           type: string
         dateCreated: