diff --git a/acquia_agent/acquia_agent.module b/acquia_agent/acquia_agent.module
index 2bb1555..54c8a0f 100644
--- a/acquia_agent/acquia_agent.module
+++ b/acquia_agent/acquia_agent.module
@@ -227,11 +227,11 @@ function acquia_agent_init() {
     empty($_POST) &&  user_access('administer site configuration') &&
     (!acquia_agent_has_credentials()) &&
     (strpos($request, variable_get('file_public_path', conf_path() . DIRECTORY_SEPARATOR . 'files')) !== 0)) {
-    $text = 'Get a <a href="!acquia-free">free 30-day trial</a> of the Acquia Network which includes a <a href="!library" target="_blank">library</a> of expert knowledge, <a href="!services" target="_blank">tools and services</a> to make your site awesome, and <a href="!support" target="_blank">Drupal support</a> when you need it.<br/>If you have an Acquia Network subscription, <a href="!settings">connect now</a>. Otherwise, you can turn this message off by disabling the Acquia Network <a href="!admin-modules">modules</a>.';
+    $text = 'Sign up for Acquia Cloud Free, a free Drupal sandbox to experiment with new features, test your code quality, and apply continuous integration best practices. Check out the <a href="!acquia-free">epic set of dev features and tools</a> that come with your free subscription.<br/>If you have an Acquia Network subscription, <a href="!settings">connect now</a>. Otherwise, you can turn this message off by disabling the Acquia Network modules.';
     if (isset($_SERVER['AH_SITE_GROUP'])) {
       $text = '<a href="!settings">Connect your site to the Acquia Network now</a>. <a href="!more">Learn more</a>.';
     }
-    $message = t($text, array('!more' => url('https://docs.acquia.com/network/install/connector'), '!acquia-free' => url('admin/config/system/acquia-agent'), '!library' => url('http://library.acquia.com'), '!settings' => url('admin/config/system/acquia-agent/setup'), '!support' => url('http://www.acquia.com/drupal-support'), '!services' => url('http://www.acquia.com/products-services/acquia-network/cloud-services'), '!admin-modules' => url('admin/modules')));
+    $message = t($text, array('!acquia-free' => url('https://www.acquia.com/acquia-cloud-free'), '!settings' => url('admin/config/system/acquia-agent/setup')));
     drupal_set_message($message, 'warning', FALSE);
   }
 }
diff --git a/acquia_agent/acquia_agent.pages.inc b/acquia_agent/acquia_agent.pages.inc
index 2d2ab2d..2b224a4 100644
--- a/acquia_agent/acquia_agent.pages.inc
+++ b/acquia_agent/acquia_agent.pages.inc
@@ -142,7 +142,7 @@ function acquia_agent_migrate_form($form, &$form_state) {
 }
 
 /**
- *  Main 30 day trial form function
+ *  Main free subscription form function
  */
 function acquia_agent_an_start_form($form, &$form_state, $banner) {
   $header = acquia_agent_an_info_header();
@@ -181,7 +181,7 @@ function acquia_agent_settings_page($arg = NULL) {
   drupal_add_css($path . '/css/acquia_agent.css');
 
   if (empty($identifier) && empty($key) && $arg != 'setup') {
-    drupal_set_title(t('Get a free 30 day trial of the Acquia Network'));
+    drupal_set_title(t('Get an Acquia Cloud Free subscription'));
     return drupal_get_form('acquia_agent_an_start_form', $banner);
   }
   if (empty($identifier) && empty($key)) {
@@ -221,7 +221,7 @@ function _acquia_agent_automatic_setup_form_start(&$form_state) {
     'pass' => array(
       '#type' => 'password',
       '#title' => t('Enter your Acquia Network password:'),
-      '#description' => t('Your password will not be stored locally and will be sent securely to Acquia.com. <a href="!url" target="_blank">Forgot password?</a>', array('!url' => url('http://acquia.com/user/password'))),
+      '#description' => t('Your password will not be stored locally and will be sent securely to Acquia.com. <a href="!url" target="_blank">Forgot password?</a>', array('!url' => url('https://accounts.acquia.com/user/password'))),
       '#size' => 32,
       '#required' => TRUE,
     ),
@@ -232,7 +232,7 @@ function _acquia_agent_automatic_setup_form_start(&$form_state) {
         '#value' => t('Next'),
       ),
       'signup' => array(
-        '#markup' => t('Need a subscription? <a href="!url">Get one</a>.', array('!url' => url('https://www.acquia.com/trial'))),
+        '#markup' => t('Need a subscription? <a href="!url">Get one</a>.', array('!url' => url('https://www.acquia.com/acquia-cloud-free'))),
       ),
     ),
   );
@@ -365,7 +365,7 @@ function acquia_agent_settings_credentials($form, &$form_state) {
   $identifier = acquia_agent_settings('acquia_identifier');
   $key = acquia_agent_settings('acquia_key');
 
-  $form['#prefix'] = t('Enter your <a href="!net">identifer and key</a> from your subscriptions overview or <a href="!url">log in</a> to connect your site to the Acquia Network.', array('!net' => url('http://network.acquia.com/network/dashboard/subscription'), '!url' => url('admin/config/system/acquia-agent/setup')));
+  $form['#prefix'] = t('Enter your <a href="!net">identifer and key</a> from your subscriptions overview or <a href="!url">log in</a> to connect your site to the Acquia Network.', array('!net' => url('https://insight.acquia.com/subscriptions'), '!url' => url('admin/config/system/acquia-agent/setup')));
   $form['acquia_identifier'] = array(
     '#type' => 'textfield',
     '#title' => t('Identifier'),
@@ -384,7 +384,7 @@ function acquia_agent_settings_credentials($form, &$form_state) {
     '#value' => t('Connect'),
   );
   $form['actions']['signup'] = array(
-    '#markup' => t('Need a subscription? <a href="!url">Get one</a>.', array('!url' => url('https://www.acquia.com/trial'))),
+    '#markup' => t('Need a subscription? <a href="!url">Get one</a>.', array('!url' => url('https://www.acquia.com/acquia-cloud-free'))),
   );
 
   return $form;
diff --git a/acquia_agent/tests/acquia_agent.test b/acquia_agent/tests/acquia_agent.test
index abf87d7..8bdd860 100644
--- a/acquia_agent/tests/acquia_agent.test
+++ b/acquia_agent/tests/acquia_agent.test
@@ -9,8 +9,7 @@ class AcquiaAgentTestCase extends DrupalWebTestCase {
   protected $credentials_path;
   protected $settings_path;
   protected $help_path;
-  protected $cloud_services_url;
-  protected $trial_url;
+  protected $cloud_free_url;
   protected $acquia_test_id;
   protected $acquia_test_key;
 
@@ -43,8 +42,7 @@ class AcquiaAgentTestCase extends DrupalWebTestCase {
     $this->credentials_path = 'admin/config/system/acquia-agent/credentials';
     $this->settings_path = 'admin/config/system/acquia-agent';
     $this->help_path = 'admin/help/acquia_agent';
-    $this->cloud_services_url = 'http://www.acquia.com/products-services/acquia-network/cloud-services';
-    $this->trial_url = 'https://www.acquia.com/trial';
+    $this->cloud_free_url = 'https://www.acquia.com/acquia-cloud-free';
     $this->status_report_url = 'admin/reports/status';
     $this->migrate_path = 'admin/config/system/acquia-agent/migrate';
     variable_set('acquia_network_address', $base_url);
@@ -58,8 +56,8 @@ class AcquiaAgentTestCase extends DrupalWebTestCase {
    */
   private function acquiaAgentStrings($id) {
     switch ($id) {
-      case '30-day':
-        return 'Get a free 30-day trial of the Acquia Network which includes a library of expert knowledge, tools and services to make your site awesome, and Drupal support when you need it.';
+      case 'free':
+        return 'Sign up for Acquia Cloud Free, a free Drupal sandbox to experiment with new features, test your code quality, and apply continuous integration best practices.';
       case 'get-connected':
         return 'If you have an Acquia Network subscription, connect now. Otherwise, you can turn this message off by disabling the Acquia Network modules.';
       case 'enter-email':
@@ -96,15 +94,15 @@ class AcquiaAgentTestCase extends DrupalWebTestCase {
   public function testAcquiaAgentGetConnected() {
     // Check for call to get connected.
     $this->drupalGet('admin');
-    $this->assertText($this->acquiaAgentStrings('30-day'), 'The explanation of services text exists');
-    $this->assertLinkByHref($this->cloud_services_url, 0, 'Link to Acquia.com Cloud Services exists');
+    $this->assertText($this->acquiaAgentStrings('free'), 'The explanation of services text exists');
+    $this->assertLinkByHref($this->cloud_free_url, 0, 'Link to Acquia.com Cloud Services exists');
     $this->assertText($this->acquiaAgentStrings('get-connected'), 'The call-to-action to connect text exists');
     $this->assertLink('connect now', 0, 'The "connect now" link exists');
     // Check connection setup page.
     $this->drupalGet($this->setup_path);
     $this->assertText($this->acquiaAgentStrings('enter-email'), 'The email address field label exists');
     $this->assertText($this->acquiaAgentStrings('enter-password'), 'The password field label exists');
-    $this->assertLinkByHref($this->trial_url, 0, 'Link to Acquia.com trial signup exists');
+    $this->assertLinkByHref($this->cloud_free_url, 0, 'Link to Acquia.com free signup exists');
     // Check errors on automatic setup page.
     $edit_fields = array(
       'email' => $this->randomName(),
@@ -118,7 +116,7 @@ class AcquiaAgentTestCase extends DrupalWebTestCase {
     $this->drupalGet($this->credentials_path);
     $this->assertText($this->acquiaAgentStrings('id-key'), 'The network key and id description exists');
     $this->assertText($this->acquiaAgentStrings('enter-key'), 'The network key field label exists');
-    $this->assertLinkByHref($this->trial_url, 0, 'Link to Acquia.com trial signup exists');
+    $this->assertLinkByHref($this->cloud_free_url, 0, 'Link to Acquia.com free signup exists');
     // Check errors on connection page.
     $edit_fields = array(
       'acquia_identifier' => $this->randomName(),