diff --git a/README.md b/README.md
index 4bbf2c2..572f3e0 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ ng add ngx-scrolltop
 
 _Module imported and all settings automatically set in your project._
 
-_Now just see some [options](#options)_
+_Now just see some [options](#options)._
 
 ### Manually (alternatively) 🛠
 
@@ -78,7 +78,7 @@ In **app.component.html** you just need to add your new button. Usually at the e
 | **size**            | number                                                                          | 40        | Button size [in pixels]. _(Symbol will be resized automatically_)                                                                                                                                        |
 | **symbol**          | string                                                                          |           | You can use utf8 chars for customizing symbol. For example: `↑`                                                                                                                                          |
 | **position**        | 'left' \| 'right'                                                               | 'right'   | Left or right, that is the question...                                                                                                                                                                   |
-| **theme**           | [NgxScrolltopTheme](projects/ngx-scrolltop/src/lib/ngx-scrolltop.interfaces.ts) | 'gray'    | Material color themes                                                                                                                                                                                    |
+| **theme**           | [NgxScrollTopTheme](projects/ngx-scrolltop/src/lib/ngx-scrolltop.interfaces.ts) | 'gray'    | Material color themes                                                                                                                                                                                    |
 
 ### Options: Example
 
diff --git a/projects/example/src/app/app.module.ts b/projects/example/src/app/app.module.ts
index 0105378..1fc8b7c 100644
--- a/projects/example/src/app/app.module.ts
+++ b/projects/example/src/app/app.module.ts
@@ -3,11 +3,11 @@ import { NgModule } from '@angular/core';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { NgxScrolltopModule } from 'ngx-scrolltop';
+import { NgxScrollTopModule } from 'ngx-scrolltop';
 
 @NgModule({
   declarations: [AppComponent],
-  imports: [BrowserModule, AppRoutingModule, NgxScrolltopModule],
+  imports: [BrowserModule, AppRoutingModule, NgxScrollTopModule],
   providers: [],
   bootstrap: [AppComponent],
 })
diff --git a/projects/ngx-scrolltop/README.md b/projects/ngx-scrolltop/README.md
index 4bbf2c2..7e8d92d 100644
--- a/projects/ngx-scrolltop/README.md
+++ b/projects/ngx-scrolltop/README.md
@@ -78,7 +78,7 @@ In **app.component.html** you just need to add your new button. Usually at the e
 | **size**            | number                                                                          | 40        | Button size [in pixels]. _(Symbol will be resized automatically_)                                                                                                                                        |
 | **symbol**          | string                                                                          |           | You can use utf8 chars for customizing symbol. For example: `↑`                                                                                                                                          |
 | **position**        | 'left' \| 'right'                                                               | 'right'   | Left or right, that is the question...                                                                                                                                                                   |
-| **theme**           | [NgxScrolltopTheme](projects/ngx-scrolltop/src/lib/ngx-scrolltop.interfaces.ts) | 'gray'    | Material color themes                                                                                                                                                                                    |
+| **theme**           | [NgxScrollTopTheme](projects/ngx-scrolltop/src/lib/ngx-scrolltop.interfaces.ts) | 'gray'    | Material color themes                                                                                                                                                                                    |
 
 ### Options: Example
 
diff --git a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.component.spec.ts b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.component.spec.ts
index 1a3db57..0076d03 100644
--- a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.component.spec.ts
+++ b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { NgxScrolltopComponent } from './ngx-scrolltop.component';
+import { NgxScrollTopComponent } from './ngx-scrolltop.component';
 
-describe('NgxScrolltopComponent', () => {
-  let component: NgxScrolltopComponent;
-  let fixture: ComponentFixture<NgxScrolltopComponent>;
+describe('NgxScrollTopComponent', () => {
+  let component: NgxScrollTopComponent;
+  let fixture: ComponentFixture<NgxScrollTopComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ NgxScrolltopComponent ]
+      declarations: [ NgxScrollTopComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(NgxScrolltopComponent);
+    fixture = TestBed.createComponent(NgxScrollTopComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.component.ts b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.component.ts
index 2aad7aa..c9b84b4 100644
--- a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.component.ts
+++ b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.component.ts
@@ -9,9 +9,9 @@ import {
 } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import {
-  NgxScrolltopMode,
-  NgxScrolltopTheme,
-  NgxScrolltopPosition,
+  NgxScrollTopMode,
+  NgxScrollTopTheme,
+  NgxScrollTopPosition,
 } from './ngx-scrolltop.interfaces';
 
 @Component({
@@ -19,14 +19,14 @@ import {
   templateUrl: './ngx-scrolltop.component.html',
   styleUrls: ['./ngx-scrolltop.component.scss'],
 })
-export class NgxScrolltopComponent implements OnInit {
+export class NgxScrollTopComponent implements OnInit {
   @Input() backgroundColor: string;
   @Input() symbolColor: string;
   @Input() size: number;
   @Input() symbol: string;
-  @Input() position: NgxScrolltopPosition = 'right';
-  @Input() theme: NgxScrolltopTheme = 'gray';
-  @Input() mode: NgxScrolltopMode = 'classic';
+  @Input() position: NgxScrollTopPosition = 'right';
+  @Input() theme: NgxScrollTopTheme = 'gray';
+  @Input() mode: NgxScrollTopMode = 'classic';
 
   public show = false;
   private scrolledFromTop = false;
diff --git a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.interfaces.ts b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.interfaces.ts
index 69aa00e..bc50fe4 100644
--- a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.interfaces.ts
+++ b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.interfaces.ts
@@ -1,5 +1,5 @@
 // Material colors https://material.io/design/color
-export type NgxScrolltopTheme =
+export type NgxScrollTopTheme =
   | 'black'
   | 'white'
   | 'gray'
@@ -14,6 +14,6 @@ export type NgxScrolltopTheme =
   | 'pink'
   | 'red';
 
-export type NgxScrolltopMode = 'classic' | 'smart';
+export type NgxScrollTopMode = 'classic' | 'smart';
 
-export type NgxScrolltopPosition = 'right' | 'left';
+export type NgxScrollTopPosition = 'right' | 'left';
diff --git a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.module.ts b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.module.ts
index 8e385c4..a4ce914 100644
--- a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.module.ts
+++ b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.module.ts
@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core';
-import { NgxScrolltopComponent } from './ngx-scrolltop.component';
+import { NgxScrollTopComponent } from './ngx-scrolltop.component';
 import { CommonModule } from '@angular/common';
 
 @NgModule({
-  declarations: [NgxScrolltopComponent],
+  declarations: [NgxScrollTopComponent],
   imports: [CommonModule],
-  exports: [NgxScrolltopComponent],
+  exports: [NgxScrollTopComponent],
 })
-export class NgxScrolltopModule {}
+export class NgxScrollTopModule {}
diff --git a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.service.spec.ts b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.service.spec.ts
index d1c225a..ad878ff 100644
--- a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.service.spec.ts
+++ b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.service.spec.ts
@@ -1,12 +1,12 @@
 import { TestBed } from '@angular/core/testing';
 
-import { NgxScrolltopService } from './ngx-scrolltop.service';
+import { NgxScrollTopService } from './ngx-scrolltop.service';
 
-describe('NgxScrolltopService', () => {
+describe('NgxScrollTopService', () => {
   beforeEach(() => TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: NgxScrolltopService = TestBed.get(NgxScrolltopService);
+    const service: NgxScrollTopService = TestBed.get(NgxScrollTopService);
     expect(service).toBeTruthy();
   });
 });
diff --git a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.service.ts b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.service.ts
index 2f8cee8..d2c0d71 100644
--- a/projects/ngx-scrolltop/src/lib/ngx-scrolltop.service.ts
+++ b/projects/ngx-scrolltop/src/lib/ngx-scrolltop.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 @Injectable({
   providedIn: 'root'
 })
-export class NgxScrolltopService {
+export class NgxScrollTopService {
 
   constructor() { }
 }
diff --git a/projects/schematics/src/ng-add/add-declaration-to-module.rule.ts b/projects/schematics/src/ng-add/add-declaration-to-module.rule.ts
index 9be05d8..453564e 100644
--- a/projects/schematics/src/ng-add/add-declaration-to-module.rule.ts
+++ b/projects/schematics/src/ng-add/add-declaration-to-module.rule.ts
@@ -30,7 +30,7 @@ export function addDeclarationToAppModule(appModule: string): Rule {
       source,
       modulePath,
       'imports',
-      'NgxScrolltopModule',
+      'NgxScrollTopModule',
       'ngx-scrolltop'
     );
 
diff --git a/projects/schematics/src/ng-add/schema.json b/projects/schematics/src/ng-add/schema.json
index 4ccc8e6..39a20d2 100644
--- a/projects/schematics/src/ng-add/schema.json
+++ b/projects/schematics/src/ng-add/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsNgxScrolltopAdd",
+  "id": "SchematicsNgxScrollTopAdd",
   "title": "ngx-scrolltop Add Options Schema",
   "type": "object",
   "properties": {