diff --git a/src/components/@shared/Form/FormFields/Datatoken/index.tsx b/src/components/@shared/Form/FormFields/Datatoken/index.tsx
index 9b2223512..bb4280f1b 100644
--- a/src/components/@shared/Form/FormFields/Datatoken/index.tsx
+++ b/src/components/@shared/Form/FormFields/Datatoken/index.tsx
@@ -15,8 +15,10 @@ export default function Datatoken(props: InputProps): ReactElement {
 
   // Generate new DT name & symbol on first mount
   useEffect(() => {
+    if (field.value.name !== '') return
+
     generateName()
-  }, [])
+  }, [field.value.name])
 
   return (
     <div className={styles.datatoken}>
diff --git a/src/components/Publish/FormPublish/Pricing/Coin.tsx b/src/components/Publish/FormPublish/Pricing/Coin.tsx
index 6a23fa135..605febf19 100644
--- a/src/components/Publish/FormPublish/Pricing/Coin.tsx
+++ b/src/components/Publish/FormPublish/Pricing/Coin.tsx
@@ -18,7 +18,7 @@ export default function Coin({
   weight: string
   readOnly?: boolean
 }): ReactElement {
-  const [field, meta] = useField(name)
+  const [field, meta] = useField(`pricing.${name}`)
 
   return (
     <div className={styles.coin}>
diff --git a/src/components/Publish/FormPublish/Pricing/Fees.tsx b/src/components/Publish/FormPublish/Pricing/Fees.tsx
index 3535ef4d7..2c94b327a 100644
--- a/src/components/Publish/FormPublish/Pricing/Fees.tsx
+++ b/src/components/Publish/FormPublish/Pricing/Fees.tsx
@@ -36,7 +36,7 @@ export default function Fees({
   tooltips: { [key: string]: string }
   pricingType: 'dynamic' | 'fixed'
 }): ReactElement {
-  const [field, meta] = useField('swapFee')
+  const [field, meta] = useField('pricing.swapFee')
 
   return (
     <>
diff --git a/src/components/Publish/FormPublish/Pricing/Price.tsx b/src/components/Publish/FormPublish/Pricing/Price.tsx
index 261ae739c..2fafe3224 100644
--- a/src/components/Publish/FormPublish/Pricing/Price.tsx
+++ b/src/components/Publish/FormPublish/Pricing/Price.tsx
@@ -14,7 +14,7 @@ export default function Price({
   firstPrice?: string
   free?: boolean
 }): ReactElement {
-  const [field, meta] = useField('price')
+  const [field, meta] = useField('pricing.price')
 
   const { values } = useFormikContext<FormPublishData>()
   const { dataTokenOptions } = values.services[0]
diff --git a/src/components/Publish/FormPublish/Pricing/index.tsx b/src/components/Publish/FormPublish/Pricing/index.tsx
index 45758d87a..ccb8f2b62 100644
--- a/src/components/Publish/FormPublish/Pricing/index.tsx
+++ b/src/components/Publish/FormPublish/Pricing/index.tsx
@@ -19,6 +19,8 @@ export default function PricingFields(): ReactElement {
   const { pricing } = values
   const { price, oceanAmount, weightOnOcean, weightOnDataToken, type } = pricing
 
+  console.log(pricing)
+
   // Switch type value upon tab change
   function handleTabChange(tabName: string) {
     const type = tabName.toLowerCase()