diff --git a/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.html b/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.html
index bd9b9593fb..ff921d6858 100644
--- a/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.html
+++ b/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.html
@@ -3,7 +3,7 @@
 <div fxLayout="column" fxFill fxLayoutGap="2px">
     <div fxLayout="row" fxFill>
         <div fxLayout="column" fxFlex="80%">
-            <adf-task-form-cloud
+            <adf-cloud-task-form
                 [appName]="appName"
                 [taskId]="taskId"
                 (cancelClick)="goBack()"
@@ -11,7 +11,7 @@
                 (taskCompleted)="onTaskCompleted()"
                 (taskUnclaimed)="onUnclaimTask()"
                 (formSaved)="onFormSaved()">
-            </adf-task-form-cloud>
+            </adf-cloud-task-form>
         </div>
         <adf-cloud-task-header fxFlex
             [appName]="appName"
diff --git a/docs/process-services-cloud/components/task-form-cloud.component.md b/docs/process-services-cloud/components/task-form-cloud.component.md
index 7fbe9449a6..748b0837d1 100644
--- a/docs/process-services-cloud/components/task-form-cloud.component.md
+++ b/docs/process-services-cloud/components/task-form-cloud.component.md
@@ -20,13 +20,12 @@ Shows a [`form`](../../../lib/process-services-cloud/src/lib/form/models/form-cl
 ## Basic Usage
 
 ```html
-<adf-task-form-cloud 
+<adf-cloud-task-form 
     [appName]="appName"
     [taskId]="taskId">
-</adf-task-form-cloud>
+</adf-cloud-task-form>
 ```
 
-
 ## Class members
 
 ### Properties
@@ -35,6 +34,7 @@ Shows a [`form`](../../../lib/process-services-cloud/src/lib/form/models/form-cl
 | ---- | ---- | ------------- | ----------- |
 | appName | `string` |  | App id to fetch corresponding form and values. |
 | taskId | `string` |  | Task id to fetch corresponding form and values. |
+| showRefreshButton | `boolean` | false | Toggle rendering of the `Refresh` button. |
 | showValidationIcon | `boolean` | true | Toggle rendering of the `Validation` icon. |
 | showCancelButton | `boolean` | true | Toggle rendering of the `Cancel` outcome button. |
 | showCompleteButton | `boolean` | true | Toggle rendering of the `Complete` outcome button. |
diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.scss b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.scss
index 20ec263d60..7a41730a76 100644
--- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.scss
+++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.scss
@@ -1,4 +1,4 @@
-@mixin adf-process-filters-cloud-theme($theme) {
+@mixin adf-cloud-process-filters-theme($theme) {
 
     .adf {
 
diff --git a/lib/process-services-cloud/src/lib/styles/_index.scss b/lib/process-services-cloud/src/lib/styles/_index.scss
index dc08214bf3..ff3368aaaf 100644
--- a/lib/process-services-cloud/src/lib/styles/_index.scss
+++ b/lib/process-services-cloud/src/lib/styles/_index.scss
@@ -16,9 +16,9 @@
     @include adf-cloud-task-filters-theme($theme);
     @include adf-cloud-edit-task-filters-theme($theme);
     @include adf-cloud-edit-process-filter-theme($theme);
-    @include adf-process-filters-cloud-theme($theme);
-    @include adf-start-task-cloud-theme($theme);
+    @include adf-cloud-process-filters-theme($theme);
+    @include adf-cloud-start-task-theme($theme);
     @include adf-cloud-people-theme($theme);
     @include adf-cloud-group-theme($theme);
-    @include adf-task-form-cloud-theme($theme);
+    @include adf-cloud-task-form-theme($theme);
 }
diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss
index 4e78c28b34..5c02cf2235 100644
--- a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss
+++ b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.scss
@@ -1,4 +1,4 @@
-@mixin adf-start-task-cloud-theme($theme) {
+@mixin adf-cloud-start-task-theme($theme) {
     $primary: map-get($theme, primary);
     $accent: map-get($theme, accent);
     $warn: map-get($theme, warn);
diff --git a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.scss b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.scss
index 11e52617b9..b54b91bfe5 100644
--- a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.scss
+++ b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.scss
@@ -1,4 +1,4 @@
-@mixin adf-task-form-cloud-theme($theme) {
+@mixin adf-cloud-task-form-theme($theme) {
 
     $config: mat-typography-config();
 
diff --git a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts
index c0d34b2f5e..8a5f5b9568 100644
--- a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts
@@ -25,7 +25,7 @@ import { TaskCloudService } from '../../services/task-cloud.service';
 import { IdentityUserService, FormOutcomeModel } from '@alfresco/adf-core';
 
 @Component({
-    selector: 'adf-task-form-cloud',
+    selector: 'adf-cloud-task-form',
     templateUrl: './task-form-cloud.component.html',
     styleUrls: ['./task-form-cloud.component.scss']
 })