--- original
+++ updated
@@ -1,16 +1,14 @@
 import './style.scss';
 import './editor.scss';
-import globals from 'cgbGlobal';
-const { __ } = wp.i18n; // Import __() from wp.i18n
-const { registerBlockType } = wp.blocks; // Import registerBlockType() from wp.blocks
-const { InspectorControls, PanelColorSettings } = wp.blockEditor; // Import color settings from wp.editor
-const { RichText } = wp.blockEditor; // Import RichText blocks from wp.editor
+import { __ } from '@wordpress/i18n';
+import { registerBlockType } from '@wordpress/blocks';
+import { InspectorControls, PanelColorSettings, RichText } from '@wordpress/block-editor';
 
 /**
  * Register: CC-BY Gutenberg block.
  *
  * Registers a new block provided a unique name and an object defining its
- * behavior. Once registered, the block is made editor as an option to any
+ * behavior. Once registered, the block is made available as an option to any
  * editor interface where blocks are implemented.
  *
  * @link https://wordpress.org/gutenberg/handbook/block-api/
@@ -19,7 +17,7 @@
  * @return {?WPBlock}          The block, if it has been successfully
  *                             registered; otherwise `undefined`.
  */
-registerBlockType('cgb/cc-by', {
+registerBlockType('cc/cc-by', {
 	title: __('CC-BY'),
 	icon: 'media-text',
 	category: 'cc-licenses',
@@ -34,11 +32,11 @@
 			default: 'black',
 		},
 		contentName: {
-			selector: '.cc-cgb-name',
+			selector: '.cc-name',
 			source: 'children',
 		},
 		contentText: {
-			selector: '.cc-cgb-text',
+			selector: '.cc-text',
 			source: 'children',
 		},
 	},
@@ -54,18 +52,11 @@
 	 * @returns {Mixed} JSX Component.
 	 */
 	edit: function (props) {
-		const bgColor = props.attributes.bgColor;
-		const txtColor = props.attributes.txtColor;
-		const contentName = props.attributes.contentName;
-		const contentText = props.attributes.contentText;
-		const { attributes: className, setAttributes } = props;
+		const { bgColor, txtColor, contentName, contentText } = props.attributes;
+		const { setAttributes } = props;
 
-		const onChangeContentName = contentName => {
-			setAttributes({ contentName });
-		};
-		const onChangeContentText = contentText => {
-			setAttributes({ contentText });
-		};
+		const onChangeContentName = contentName => setAttributes({ contentName });
+		const onChangeContentText = contentText => setAttributes({ contentText });
 
 		return [
 			<InspectorControls key="3">
@@ -75,19 +66,19 @@
 						{
 							label: __('Background Color'),
 							value: bgColor,
-							onChange: colorValue => props.setAttributes({ bgColor: colorValue }),
+							onChange: colorValue => setAttributes({ bgColor: colorValue }),
 						},
 						{
 							label: __('Text Color'),
 							value: txtColor,
-							onChange: colorValue => props.setAttributes({ txtColor: colorValue }),
+							onChange: colorValue => setAttributes({ txtColor: colorValue }),
 						},
 					]}
 				/>
 			</InspectorControls>,
 
-			<div key="2" className={className} style={{ backgroundColor: bgColor, color: txtColor }}>
-				<img src={`${globals.pluginDirUrl}includes/images/by.png`} alt="CC-BY" width="88" height="31" />
+			<div key="2" style={{ backgroundColor: bgColor, color: txtColor }}>
+				<img src={`${pluginDirUrl}/includes/images/by.png`} alt="CC-BY" width="88" height="31" />
 				<p>
 					This content is licensed by{' '}
 					<a href="https://creativecommons.org/licenses/by/4.0/" rel="license">
@@ -98,9 +89,8 @@
 				<span>
 					Attribution name <i>(default: This content)</i>:
 				</span>
-				<div className="cc-cgb-richtext-input">
+				<div className="cc-richtext-input">
 					<RichText
-						className={className}
 						placeholder={__('This content', 'CreativeCommons')}
 						keepPlaceholderOnFocus={true}
 						onChange={onChangeContentName}
@@ -111,9 +101,8 @@
 					<br />
 					Additional text <i>(optional)</i>:
 				</span>
-				<div className="cc-cgb-richtext-input">
+				<div className="cc-richtext-input">
 					<RichText
-						className={className}
 						placeholder={__('Custom text/description/links ', 'CreativeCommons')}
 						keepPlaceholderOnFocus={true}
 						onChange={onChangeContentText}
@@ -135,26 +124,19 @@
 	 * @returns {Mixed} JSX Frontend HTML.
 	 */
 	save: function (props) {
-		const bgColor = props.attributes.bgColor;
-		const txtColor = props.attributes.txtColor;
-		let contentName = props.attributes.contentName;
-		const contentText = props.attributes.contentText;
+		const { bgColor, txtColor, contentName, contentText } = props.attributes;
 
-		if (contentName == '') {
-			contentName = 'This content'; // Default to "This Content".
-		}
 		return (
 			<div className="message-body" style={{ backgroundColor: bgColor, color: txtColor }}>
-				<img src={`${globals.pluginDirUrl}includes/images/by.png`} alt="CC" width="88" height="31" />
+				<img src={`${pluginDirUrl}/includes/images/by.png`} alt="CC" width="88" height="31" />
 				<p>
-					<span className="cc-cgb-name">{contentName}</span> is licensed under a{' '}
+					<span className="cc-name">{contentName || 'This content'}</span> is licensed under a{' '}
 					<a href="https://creativecommons.org/licenses/by/4.0/" rel="license">
 						Creative Commons Attribution 4.0 International license.
 					</a>{' '}
-					<span className="cc-cgb-text">{contentText}</span>
+					<span className="cc-text">{contentText}</span>
 				</p>
 			</div>
 		);
 	},
 });