diff --git a/Tasks/SCP/Strings/resources.resjson/en-US/resources.resjson b/Tasks/CopyFilesOverSSH/Strings/resources.resjson/en-US/resources.resjson
similarity index 98%
rename from Tasks/SCP/Strings/resources.resjson/en-US/resources.resjson
rename to Tasks/CopyFilesOverSSH/Strings/resources.resjson/en-US/resources.resjson
index 05ad6f3cf832..bf14ee8da743 100644
--- a/Tasks/SCP/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/CopyFilesOverSSH/Strings/resources.resjson/en-US/resources.resjson
@@ -1,7 +1,7 @@
 {
-  "loc.friendlyName": "SCP",
+  "loc.friendlyName": "Copy Files Over SSH",
   "loc.helpMarkDown": "[More Information](http://go.microsoft.com/fwlink/?LinkId=821894)",
-  "loc.description": "Copy files or build artifacts to a remote machine using SSH",
+  "loc.description": "Copy files or build artifacts to a remote machine over SSH",
   "loc.instanceNameFormat": "Securely copy files to the remote machine",
   "loc.group.displayName.advanced": "Advanced",
   "loc.input.label.sshEndpoint": "SSH endpoint",
diff --git a/Tasks/SCP/ThirdPartyNotices.txt b/Tasks/CopyFilesOverSSH/ThirdPartyNotices.txt
similarity index 100%
rename from Tasks/SCP/ThirdPartyNotices.txt
rename to Tasks/CopyFilesOverSSH/ThirdPartyNotices.txt
diff --git a/Tasks/SCP/scp.ts b/Tasks/CopyFilesOverSSH/copyfilesoverssh.ts
similarity index 100%
rename from Tasks/SCP/scp.ts
rename to Tasks/CopyFilesOverSSH/copyfilesoverssh.ts
diff --git a/Tasks/CopyFilesOverSSH/icon.png b/Tasks/CopyFilesOverSSH/icon.png
new file mode 100755
index 000000000000..667721310bac
Binary files /dev/null and b/Tasks/CopyFilesOverSSH/icon.png differ
diff --git a/Tasks/SCP/icon.svg b/Tasks/CopyFilesOverSSH/icon.svg
old mode 100644
new mode 100755
similarity index 95%
rename from Tasks/SCP/icon.svg
rename to Tasks/CopyFilesOverSSH/icon.svg
index 9bf78d143d4f..3aee906216b7
--- a/Tasks/SCP/icon.svg
+++ b/Tasks/CopyFilesOverSSH/icon.svg
@@ -12,7 +12,7 @@
    height="1024"
    width="1024"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="scp-task-icon.svg"
+   sodipodi:docname="ssh-copy--task-icon.svg"
    inkscape:export-filename="C:\Users\JimLamb\Dropbox\Work\Resources\scp-task-icon.png"
    inkscape:export-xdpi="2.8099999"
    inkscape:export-ydpi="2.8099999">
@@ -32,7 +32,7 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:zoom="0.65186409"
-     inkscape:cx="-660.73717"
+     inkscape:cx="505.15003"
      inkscape:cy="400.83687"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
@@ -46,7 +46,7 @@
        spacingy="32" />
   </sodipodi:namedview>
   <title
-     id="title4145">scp-task</title>
+     id="title4145">ssh-copy</title>
   <defs
      id="defs10">
     <pattern
@@ -67,7 +67,7 @@
         <dc:identifier>
                     sql-database-generic
                 </dc:identifier>
-        <dc:title>scp-task</dc:title>
+        <dc:title>ssh-copy</dc:title>
         <dc:format>
                     image/svg+xml
                 </dc:format>
@@ -125,8 +125,8 @@
          y="1408"
          style="font-size:180px;fill:#000000" /></flowRegion><flowPara
        id="flowPara3342"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:240px;font-family:Consolas;-inkscape-font-specification:'Consolas Bold';fill:#000000">SCP</flowPara></flowRoot>  <path
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:240px;font-family:Consolas;-inkscape-font-specification:'Consolas Bold';fill:#000000">SSH</flowPara></flowRoot>  <path
      style="font-style:normal;font-variant:normal;font-weight:400;font-size:180px;line-height:125%;font-family:'Segoe UI Symbol';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
      d="M 64 64 L 64 685.51758 L 249.30273 685.51758 L 249.30273 832 L 448 832 L 448 758.57227 L 323.34766 758.57227 L 323.34766 283.53516 L 471.43945 283.53516 L 471.43945 502.69727 L 693.95508 502.69727 L 693.95508 704 L 768 704 L 768 429.64258 L 545.48438 210.10742 L 471.43945 210.10742 L 323.34766 64 L 64 64 z M 137.66602 137.05273 L 286.13672 137.05273 L 360.18164 210.10742 L 249.30273 210.10742 L 249.30273 612.46484 L 137.66602 612.46484 L 137.66602 137.05273 z M 545.48438 319.875 L 656.74219 429.64258 L 545.48438 429.64258 L 545.48438 319.875 z "
      id="path4726" />
-</svg>
\ No newline at end of file
+</svg>
diff --git a/Tasks/SCP/package.json b/Tasks/CopyFilesOverSSH/package.json
similarity index 100%
rename from Tasks/SCP/package.json
rename to Tasks/CopyFilesOverSSH/package.json
diff --git a/Tasks/SCP/task.json b/Tasks/CopyFilesOverSSH/task.json
similarity index 97%
rename from Tasks/SCP/task.json
rename to Tasks/CopyFilesOverSSH/task.json
index bee4450e8638..651dea94a21c 100644
--- a/Tasks/SCP/task.json
+++ b/Tasks/CopyFilesOverSSH/task.json
@@ -1,8 +1,8 @@
 {
   "id": "67cec91b-0351-4c2f-8465-d74b3d2a2d96",
-  "name": "SCP",
-  "friendlyName": "SCP",
-  "description": "Copy files or build artifacts to a remote machine using SSH",
+  "name": "CopyFilesOverSSH",
+  "friendlyName": "Copy Files Over SSH",
+  "description": "Copy files or build artifacts to a remote machine over SSH",
   "helpMarkDown": "[More Information](http://go.microsoft.com/fwlink/?LinkId=821894)",
   "category": "Deploy",
   "visibility": [
@@ -88,7 +88,7 @@
   ],
   "execution": {
     "Node": {
-      "target": "scp.js",
+      "target": "copyfilesoverssh.js",
       "argumentFormat": ""
     }
   },
diff --git a/Tasks/SCP/task.loc.json b/Tasks/CopyFilesOverSSH/task.loc.json
similarity index 98%
rename from Tasks/SCP/task.loc.json
rename to Tasks/CopyFilesOverSSH/task.loc.json
index 5a1557312357..89381c10f2c6 100644
--- a/Tasks/SCP/task.loc.json
+++ b/Tasks/CopyFilesOverSSH/task.loc.json
@@ -1,6 +1,6 @@
 {
   "id": "67cec91b-0351-4c2f-8465-d74b3d2a2d96",
-  "name": "SCP",
+  "name": "CopyFilesOverSSH",
   "friendlyName": "ms-resource:loc.friendlyName",
   "description": "ms-resource:loc.description",
   "helpMarkDown": "ms-resource:loc.helpMarkDown",
@@ -87,7 +87,7 @@
   ],
   "execution": {
     "Node": {
-      "target": "scp.js",
+      "target": "copyfilesoverssh.js",
       "argumentFormat": ""
     }
   },
diff --git a/Tasks/SCP/icon.png b/Tasks/SCP/icon.png
deleted file mode 100644
index 35c287d1c685..000000000000
Binary files a/Tasks/SCP/icon.png and /dev/null differ
diff --git a/Tests/L0/SCP/_suite.ts b/Tests/L0/CopyFilesOverSSH/_suite.ts
similarity index 91%
rename from Tests/L0/SCP/_suite.ts
rename to Tests/L0/CopyFilesOverSSH/_suite.ts
index ecb063c04f94..26325d775728 100644
--- a/Tests/L0/SCP/_suite.ts
+++ b/Tests/L0/CopyFilesOverSSH/_suite.ts
@@ -9,7 +9,7 @@ function setResponseFile(name: string) {
     process.env['MOCK_RESPONSES'] = path.join(__dirname, name);
 }
 
-describe('SCP Suite', function() {
+describe('CopyFilesOverSSH Suite', function() {
     this.timeout(20000);
 
     before((done) => {
@@ -23,7 +23,7 @@ describe('SCP Suite', function() {
     it('Fails for missing endpoint', (done) => {
         setResponseFile('responseEndpoint.json');
 
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
 
         tr.run()
             .then(() => {
@@ -40,7 +40,7 @@ describe('SCP Suite', function() {
     })
     it('Fails for invalid private key', (done) => {
         setResponseFile('responseEndpoint.json');
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
         tr.setInput('sshEndpoint', 'IDInvalidKey');
         tr.setInput('sourceFolder', '/user/build');
         tr.setInput('contents', '**');
@@ -62,7 +62,7 @@ describe('SCP Suite', function() {
     })
     it('Fails when user name is not provided in the endpoint', (done) => {
         setResponseFile('responseEndpoint.json');
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
         tr.setInput('sshEndpoint', 'IDUserNameNotSet');
         tr.setInput('contents', '**');
         tr.setInput('targetFolder', '/home/mg');
@@ -82,7 +82,7 @@ describe('SCP Suite', function() {
     })
     it('Empty password/passphrase is valid in the endpoint', (done) => {
         setResponseFile('responseEndpoint.json');
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
         tr.setInput('sshEndpoint', 'IDPasswordNotSet');
 
         tr.run()
@@ -97,7 +97,7 @@ describe('SCP Suite', function() {
     })
     it('Fails when host is not provided in the endpoint', (done) => {
         setResponseFile('responseEndpoint.json');
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
         tr.setInput('sshEndpoint', 'IDHostNotSet');
 
         tr.run()
@@ -115,7 +115,7 @@ describe('SCP Suite', function() {
     })
     it('When port is not provided in the endpoint, 22 is used as default port number', (done) => {
         setResponseFile('responseEndpoint.json');
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
         tr.setInput('sshEndpoint', 'IDPortNotSet');
 
         tr.run()
@@ -130,7 +130,7 @@ describe('SCP Suite', function() {
     })
     it('Fails when connection cannot be made with given details', (done) => {
         setResponseFile('responseEndpoint.json');
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
         tr.setInput('sshEndpoint', 'IDValidKey');
         tr.setInput('sourceFolder', '/user/build');
         tr.setInput('contents', '**');
@@ -152,7 +152,7 @@ describe('SCP Suite', function() {
     it('Fails for missing target folder', (done) => {
         setResponseFile('responseEndpoint.json');
 
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
         tr.setInput('sshEndpoint', 'IDValidKey');
         tr.setInput('sourceFolder', '/user/build');
         tr.setInput('contents', '**');
@@ -171,7 +171,7 @@ describe('SCP Suite', function() {
     it('Fails for missing contents', (done) => {
         setResponseFile('responseEndpoint.json');
 
-        var tr = new trm.TaskRunner('SCP', true, true);
+        var tr = new trm.TaskRunner('CopyFilesOverSSH', true, true);
         tr.setInput('sshEndpoint', 'IDValidKey');
         tr.setInput('targetFolder', '/home/user');
 
diff --git a/Tests/L0/SCP/responseEndpoint.json b/Tests/L0/CopyFilesOverSSH/responseEndpoint.json
similarity index 100%
rename from Tests/L0/SCP/responseEndpoint.json
rename to Tests/L0/CopyFilesOverSSH/responseEndpoint.json
diff --git a/common.json b/common.json
index e1bf36db9c71..3406ae17abc1 100644
--- a/common.json
+++ b/common.json
@@ -47,7 +47,7 @@
             "dest": "Common"
         }
     ],
-    "SCP": [
+    "CopyFilesOverSSH": [
         {
             "module": "ssh-common",
             "dest": "node_modules"