diff --git a/core/index.ts b/core/index.ts
index 653b438b..987c4d85 100644
--- a/core/index.ts
+++ b/core/index.ts
@@ -40,8 +40,8 @@ import { ContentTypesService } from './shared/services/content-types.service';
 export { ContentTypesService } from './shared/services/content-types.service';
 import { GroupPermissionsService } from './shared/services/group-permissions.service';
 export { GroupPermissionsService } from './shared/services/group-permissions.service';
-import { GrousService } from './shared/services/groups.service';
-export { GrousService } from './shared/services/groups.service';
+import { Service } from './shared/services/groups.service';
+export { Service } from './shared/services/groups.service';
 import { PermissionsService } from './shared/services/permissions.service';
 export { PermissionsService } from './shared/services/permissions.service';
 import { ThemesService } from './shared/services/themes.service';
@@ -67,5 +67,5 @@ export { BaseRepositoryService } from './shared/base/services/base-repository.se
 export const RuckenCoreModules: any[] = [];
 export const RuckenCoreComponents: any[] = [];
 export const RuckenCoreShareds: any[] = [RuckenCoreRuI18n, EndpointStatusEnum, EndpointHelper, HttpHelper, RepositoryHelper, FontawesomeItemsMock, ThemeItemsMock, ContentType, Fontawesome, GroupPermission, Group, MetaModel, Permission, Theme, UserGroup, User, translate, isJson, inValues, BaseResourceModel];
-export const RuckenCoreServices: any[] = [AccountService, AppService, FontawesomeService, ContentTypesService, GroupPermissionsService, GrousService, PermissionsService, ThemesService, UserGroupsService, UsersService, BaseLocalRepositoryService, BaseRemoteRepositoryService, BaseRepositoryService];
+export const RuckenCoreServices: any[] = [AccountService, AppService, FontawesomeService, ContentTypesService, GroupPermissionsService, Service, PermissionsService, ThemesService, UserGroupsService, UsersService, BaseLocalRepositoryService, BaseRemoteRepositoryService, BaseRepositoryService];
 export const RuckenCorePipes: any[] = [];
diff --git a/core/shared/services/groups.service.ts b/core/shared/services/groups.service.ts
index 25784b07..abec5b77 100644
--- a/core/shared/services/groups.service.ts
+++ b/core/shared/services/groups.service.ts
@@ -8,7 +8,7 @@ import { RepositoryHelper } from './../helpers/repository.helper';
 import { Group } from './../models/group.model';
 
 @Injectable()
-export class GrousService extends BaseRepositoryService {
+export class Service extends BaseRepositoryService {
   items$: Subject<Group[]>;
   items: Group[];
   apiUrl: string;
@@ -24,6 +24,6 @@ export class GrousService extends BaseRepositoryService {
     return new Group(item);
   }
   newCache() {
-    return new GrousService(this.repositoryHelper);
+    return new Service(this.repositoryHelper);
   }
 }
diff --git a/src/grids/groups-grid/group-select-input/group-select-input.component.ts b/src/grids/groups-grid/group-select-input/group-select-input.component.ts
index ca62f430..cd28f9f2 100644
--- a/src/grids/groups-grid/group-select-input/group-select-input.component.ts
+++ b/src/grids/groups-grid/group-select-input/group-select-input.component.ts
@@ -2,7 +2,7 @@ import { Component, ComponentFactoryResolver, EventEmitter, Input, Output, ViewC
 import { TranslateService } from '@ngx-translate/core';
 import { Group } from '@rucken/core';
 import { User } from '@rucken/core';
-import { GrousService } from '@rucken/core';
+import { Service } from '@rucken/core';
 import { AppService } from '@rucken/core';
 import { AccountService } from '@rucken/core';
 import { TooltipDirective } from 'ngx-bootstrap/tooltip';
@@ -38,12 +38,12 @@ export class GroupSelectInputComponent extends BaseResourceSelectInputComponent
   modelChange: EventEmitter<any | Group> = new EventEmitter<any | Group>();
 
   items: any[] | Group[];
-  cachedResourcesService: GrousService;
+  cachedResourcesService: Service;
 
   constructor(
     public app: AppService,
     public accountService: AccountService,
-    public groupsService: GrousService,
+    public groupsService: Service,
     public resolver: ComponentFactoryResolver,
     public translateService: TranslateService,
     public config: BaseResourceSelectInputConfig
diff --git a/src/grids/groups-grid/groups-grid.component.ts b/src/grids/groups-grid/groups-grid.component.ts
index aefdabc6..916398a2 100644
--- a/src/grids/groups-grid/groups-grid.component.ts
+++ b/src/grids/groups-grid/groups-grid.component.ts
@@ -2,7 +2,7 @@ import { Component, ComponentFactoryResolver, ElementRef, EventEmitter, Output,
 import { TranslateService } from '@ngx-translate/core';
 import { User } from '@rucken/core';
 import { Group } from '@rucken/core';
-import { GrousService } from '@rucken/core';
+import { Service } from '@rucken/core';
 import { AppService } from '@rucken/core';
 import { AccountService } from '@rucken/core';
 
@@ -28,10 +28,10 @@ export class GroupsGridComponent extends BaseResourcesGridComponent {
   modelMeta: any = Group.meta();
   items: any[] | Group[];
   selectedItems: any[] | Group[];
-  cachedResourcesService: GrousService;
+  cachedResourcesService: Service;
 
   constructor(
-    public groupsService: GrousService,
+    public groupsService: Service,
     public accountService: AccountService,
     public app: AppService,
     public resolver: ComponentFactoryResolver,
diff --git a/src/grids/user-groups-grid/user-groups-grid.component.ts b/src/grids/user-groups-grid/user-groups-grid.component.ts
index c7af2ed2..0d950d39 100644
--- a/src/grids/user-groups-grid/user-groups-grid.component.ts
+++ b/src/grids/user-groups-grid/user-groups-grid.component.ts
@@ -4,7 +4,7 @@ import { UserGroup } from '@rucken/core';
 import { User } from '@rucken/core';
 import { Group } from '@rucken/core';
 import { UserGroupsService } from '@rucken/core';
-import { GrousService } from '@rucken/core';
+import { Service } from '@rucken/core';
 import { AppService } from '@rucken/core';
 import { AccountService } from '@rucken/core';
 
@@ -41,7 +41,7 @@ export class UserGroupsGridComponent extends BaseResourcesGridComponent {
 
   constructor(
     public userGroupsService: UserGroupsService,
-    public groupsService: GrousService,
+    public groupsService: Service,
     public accountService: AccountService,
     public app: AppService,
     public resolver: ComponentFactoryResolver,