diff --git a/frontend/src/app/features/calendar/wp-calendar/wp-calendar.component.ts b/frontend/src/app/features/calendar/wp-calendar/wp-calendar.component.ts
index ab410e1ad0..b443fa9e28 100644
--- a/frontend/src/app/features/calendar/wp-calendar/wp-calendar.component.ts
+++ b/frontend/src/app/features/calendar/wp-calendar/wp-calendar.component.ts
@@ -37,7 +37,7 @@ import { CurrentProjectService } from 'core-app/core/current-project/current-pro
 @Component({
   templateUrl: './wp-calendar.template.html',
   styleUrls: ['./wp-calendar.sass'],
-  selector: 'wp-calendar',
+  selector: 'op-wp-calendar',
   providers: [
     OpCalendarService,
   ],
diff --git a/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.html b/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.html
index 9a407873d0..0bc5543882 100644
--- a/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.html
+++ b/frontend/src/app/shared/components/grids/widgets/wp-calendar/wp-calendar.component.html
@@ -9,6 +9,6 @@
 </widget-header>
 
 <ng-container wp-isolated-query-space>
-  <wp-calendar
-      [static]="true"></wp-calendar>
+  <op-wp-calendar
+      [static]="true"></op-wp-calendar>
 </ng-container>
diff --git a/modules/calendar/spec/controllers/calendar_controller_spec.rb b/modules/calendar/spec/controllers/calendar_controller_spec.rb
index 977b97a034..ab5346ff01 100644
--- a/modules/calendar/spec/controllers/calendar_controller_spec.rb
+++ b/modules/calendar/spec/controllers/calendar_controller_spec.rb
@@ -42,7 +42,7 @@ describe Calendar::CalendarController, type: :controller do
     FactoryBot.build_stubbed(:user).tap do |user|
       allow(user)
         .to receive(:allowed_to?) do |permission, p, global:|
-        permission[:controller] == '/calendar/calendar' &&
+        permission[:controller] == 'calendar/calendar' &&
           permission[:action] == 'index' &&
           (p.nil? || p == project)
       end