Remove C&C from all textual and code mentions

README.md

@@ -6,11 +6,11 @@ Infection Monkey
 
 Welcome to the Infection Monkey! 
 
-The Infection Monkey is an open source security tool for testing a data center's resiliency to perimeter breaches and internal server infection. The Monkey uses various methods to self propagate across a data center and reports success to a centralized Command and Control(C&C) server.
+The Infection Monkey is an open source security tool for testing a data center's resiliency to perimeter breaches and internal server infection. The Monkey uses various methods to self propagate across a data center and reports success to a centralized Monkey Island Command and Control server.
 
 The Infection Monkey is comprised of two parts:
 * Chaos Monkey - A tool which infects other machines and propagates to them
-* Monkey Island - A C&C server with a dedicated UI to visualize the Chaos Monkey's progress inside the data center
+* Monkey Island - A dedicated UI to visualize the Chaos Monkey's progress inside the data center
 
 To read more about the Monkey, visit http://infectionmonkey.com 
 
@@ -22,7 +22,7 @@ The Infection Monkey uses the following techniques and exploits to propagate to
 * Multiple propagation techniques:
   * Predefined passwords
   * Common logical exploits
-  * Password stealing using mimikatz
+  * Password stealing using Mimikatz
 * Multiple exploit methods:
   * SSH
   * SMB
@@ -39,15 +39,15 @@ Getting Started
 
 ### Requirements
 
-The C&C Server has been tested on Ubuntu 14.04,15.04 and 16.04. 
+The Monkey Island server has been tested on Ubuntu 14.04,15.04 and 16.04 and Windows Server 2012.
-The Monkey itself has been tested on Windows XP, 7, 8.1 and 10. The Linux build has been tested on Ubuntu server (multiple versions).
+The Monkey itself has been tested on Windows XP, 7, 8.1 and 10. The Linux build has been tested on Ubuntu server and Debian (multiple versions).
 
 ### Installation
 
 For off-the-shelf use, download a Debian package from our website and follow the guide [written in our blog](https://www.guardicore.com/2016/07/infection-monkey-loose-2/).
 Warning! The Debian package will uninstall the python library 'bson' because of an issue with pymongo. You can reinstall it later, but monkey island will probably not work.
 
-To manually set up and the C&C server follow the instructions on [Monkey Island readme](monkey_island/readme.txt). If you wish to compile the binaries yourself, follow the instructions under Building the Monkey from Source.
+To manually set up and the Monkey Island server follow the instructions on [Monkey Island readme](monkey_island/readme.txt). If you wish to compile the binaries yourself, follow the instructions under Building the Monkey from Source.
 
 ### Start Infecting
 

chaos_monkey/control.py

@@ -25,7 +25,7 @@ class ControlClient(object):
 
     @staticmethod
     def wakeup(parent=None, default_tunnel=None, has_internet_access=None):
-        LOG.debug("Trying to wake up with C&C servers list: %r" % WormConfiguration.command_servers)
+        LOG.debug("Trying to wake up with Monkey Island servers list: %r" % WormConfiguration.command_servers)
         if parent or default_tunnel:
             LOG.debug("parent: %s, default_tunnel: %s" % (parent, default_tunnel))
         hostname = gethostname()

monkey_island/cc/main.py

@@ -33,6 +33,6 @@ if __name__ == '__main__':
                                  ssl_options={'certfile': os.environ.get('SERVER_CRT', 'server.crt'),
                                               'keyfile': os.environ.get('SERVER_KEY', 'server.key')})
         http_server.listen(ISLAND_PORT)
-        print('Monkey Island C&C Server is running on https://{}:{}'.format(local_ip_addresses()[0], ISLAND_PORT))
+        print('Monkey Island Server is running on https://{}:{}'.format(local_ip_addresses()[0], ISLAND_PORT))
         IOLoop.instance().start()
 

monkey_island/cc/services/config.py

@@ -528,7 +528,7 @@ SCHEMA = {
             }
         },
         "cnc": {
-            "title": "C&C",
+            "title": "Command and Control",
             "type": "object",
             "properties": {
                 "servers": {

monkey_island/cc/ui/src/components/Main.js

@@ -77,7 +77,7 @@ class AppComponent extends React.Component {
                 <li>
                   <NavLink to="/" exact={true}>
                     <span className="number">1.</span>
-                    Run C&C Server
+                    Run Monkey Island Server
                     { this.state.completedSteps.run_server ?
                       <Icon name="check" className="pull-right checkmark text-success"/>
                       : ''}

monkey_island/cc/ui/src/components/pages/ReportPage.js

@@ -610,7 +610,7 @@ class ReportPageComponent extends React.Component {
           The network can probably be segmented. A monkey instance on <span
           className="label label-primary">{issue.machine}</span> in the
           networks {this.generateInfoBadges(issue.networks)}
-          could directly access the Monkey Island C&C server in the
+          could directly access the Monkey Island server in the
           networks {this.generateInfoBadges(issue.server_networks)}.
         </CollapsibleWellComponent>
       </li>

monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js

@@ -146,7 +146,7 @@ class RunMonkeyPageComponent extends React.Component {
                   className="btn btn-default btn-lg center-block"
                   disabled={this.state.runningOnIslandState !== 'not_running'}
                   >
-            Run on C&C Server
+            Run on Monkey Island Server
             { this.renderIconByState(this.state.runningOnIslandState) }
           </button>
           {

monkey_island/cc/ui/src/components/pages/RunServerPage.js

@@ -10,14 +10,14 @@ class RunServerPageComponent extends React.Component {
   render() {
     return (
       <Col xs={12} lg={8}>
-        <h1 className="page-title">1. Monkey Island C&C Server</h1>
+        <h1 className="page-title">1. Monkey Island Server</h1>
         <div style={{'fontSize': '1.2em'}}>
           <p style={{'marginTop': '30px'}}>Congrats! You have successfully set up the Monkey Island server. &#x1F44F; &#x1F44F;</p>
           <p>
             The Infection Monkey is an open source security tool for testing a data center's resiliency to perimeter
             breaches and internal server infections.
             The Monkey uses various methods to propagate across a data
-            center and reports to this Command and Control (C&C) server.
+            center and reports to this Monkey Island Command and Control server.
           </p>
           <p>
             To read more about the Monkey, visit <a href="http://infectionmonkey.com" target="_blank">infectionmonkey.com</a>

monkey_island/cc/ui/src/index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Infection Monkey C&C</title>
+  <title>Infection Monkey Island Server</title>
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">

monkey_island/deb-package/DEBIAN/control

@@ -4,5 +4,5 @@ Maintainer: Guardicore
 Homepage: http://www.guardicore.com
 Priority: optional
 Version: 1.0
-Description: Guardicore Infection Monkey Island (C&C) installation package
+Description: Guardicore Infection Monkey Island installation package
 Depends: openssl, python-pip

monkey_island/readme.txt

@@ -1,4 +1,4 @@
-How to set C&C server:
+How to set up the Monkey Island server:
 
 ---------------- On Windows ----------------:
 1. Create folder "bin" under monkey_island