diff --git a/sites/all/modules/contrib/wysiwyg_code_button/ckeditor/plugin.js b/sites/all/modules/contrib/wysiwyg_code_button/ckeditor/plugin.js
index 8d10417..dcc45e1 100644
--- a/sites/all/modules/contrib/wysiwyg_code_button/ckeditor/plugin.js
+++ b/sites/all/modules/contrib/wysiwyg_code_button/ckeditor/plugin.js
@@ -13,10 +13,10 @@
    * Peter Petrik
    * http://peterpetrik.com/blog/ckeditor-and-geshi-filter
    */
-  CKEDITOR.plugins.add('code-button', {
+  CKEDITOR.plugins.add('codebutton', {
     init: function (editor) {
       // Create a new CKEditor style to add <pre> tags.
-      var buttonName = 'code-button';
+      var buttonName = 'codebutton';
       var format = {
         element : "pre"
       };
@@ -31,7 +31,7 @@
 
       // Allow the button's state to be toggled.
       // @todo: Make this work when toggling the button off too (see comment
-      //   above).
+      //   above).
       editor.attachStyleStateChange(style, function (state) {
         editor.getCommand(buttonName).setState(state);
       });
diff --git a/sites/all/modules/contrib/wysiwyg_code_button/ckeditor/wysiwyg_code_editor_ckeditor.css b/sites/all/modules/contrib/wysiwyg_code_button/ckeditor/wysiwyg_code_editor_ckeditor.css
index bae6be1..e94e1e3 100644
--- a/sites/all/modules/contrib/wysiwyg_code_button/ckeditor/wysiwyg_code_editor_ckeditor.css
+++ b/sites/all/modules/contrib/wysiwyg_code_button/ckeditor/wysiwyg_code_editor_ckeditor.css
@@ -5,10 +5,10 @@
  * http://peterpetrik.com/blog/ckeditor-and-geshi-filter
  */
 
-.cke_skin_kama .cke_button_code-button span.cke_icon {
+.cke_button_codebutton span.cke_icon {
   display: none !important;
 }
-.cke_skin_kama .cke_button_code-button span.cke_label {
-  display: inline;
+.cke_button_codebutton span.cke_label {
+  display: inline !important;
   font-size: 90%;
 }
diff --git a/sites/all/modules/contrib/wysiwyg_code_button/wysiwyg_code_button.info b/sites/all/modules/contrib/wysiwyg_code_button/wysiwyg_code_button.info
index e811371..6ece7a1 100644
--- a/sites/all/modules/contrib/wysiwyg_code_button/wysiwyg_code_button.info
+++ b/sites/all/modules/contrib/wysiwyg_code_button/wysiwyg_code_button.info
@@ -1,11 +1,4 @@
 name = WYSIWYG Code Button
 description = Provides a Code button for WYSIWYG editors (currently CKEditor).
-core = 6.x
+core = 7.x
 dependencies[] = wysiwyg
-
-; Information added by drupal.org packaging script on 2011-05-13
-version = "6.x-1.0-beta1"
-core = "6.x"
-project = "wysiwyg_code_button"
-datestamp = "1305310617"
-
diff --git a/sites/all/modules/contrib/wysiwyg_code_button/wysiwyg_code_button.module b/sites/all/modules/contrib/wysiwyg_code_button/wysiwyg_code_button.module
index ff1c066..804847d 100644
--- a/sites/all/modules/contrib/wysiwyg_code_button/wysiwyg_code_button.module
+++ b/sites/all/modules/contrib/wysiwyg_code_button/wysiwyg_code_button.module
@@ -14,11 +14,11 @@ function wysiwyg_code_button_wysiwyg_plugin($editor, $version) {
       // Add CSS for the button.
       drupal_add_css(drupal_get_path('module', 'wysiwyg_code_button') .'/ckeditor/wysiwyg_code_editor_ckeditor.css');
       return array(
-        'code-button' => array(
+        'codebutton' => array(
           'url' => 'http://drupal.org/project/wysiwyg_code_button',
-          'path' => drupal_get_path('module', 'wysiwyg_code_button') . '/ckeditor/plugin.js',
+          'path' => drupal_get_path('module', 'wysiwyg_code_button') . '/ckeditor/',
           'buttons' => array(
-            'code-button' => t('Preformatted code'),
+            'codebutton' => t('Preformatted code'),
           ),
           'load' => TRUE,
         ),