diff --git a/packages/my-joy-beta/src/components/instances/snapshots.js b/packages/my-joy-beta/src/components/instances/snapshots.js
index c6756a79..b8aaaa70 100644
--- a/packages/my-joy-beta/src/components/instances/snapshots.js
+++ b/packages/my-joy-beta/src/components/instances/snapshots.js
@@ -86,6 +86,7 @@ export const AddForm = props => (
     method="create"
     input="input"
     type="snapshot"
+    typeLabel="name"
     expanded
     onlyName
     noRemove
diff --git a/packages/ui-toolkit/src/key-value/index.js b/packages/ui-toolkit/src/key-value/index.js
index 112a53ec..95d68a80 100644
--- a/packages/ui-toolkit/src/key-value/index.js
+++ b/packages/ui-toolkit/src/key-value/index.js
@@ -111,12 +111,20 @@ const TextareaKeyValue = ({
   </Fragment>
 );
 
-const InputKeyValue = ({ type, submitting, onlyName, onlyValue }) => (
+const InputKeyValue = ({
+  type,
+  submitting,
+  typeLabel,
+  onlyName,
+  onlyValue
+}) => (
   <Flex wrap justifyStart contentStretch>
     {!onlyValue ? (
       <FlexItem basis="auto">
         <FormGroup name="name" field={Field} fluid>
-          <FormLabel>{titleCase(type)} key</FormLabel>
+          <FormLabel>
+            {titleCase(type)} {typeLabel}
+          </FormLabel>
           <Margin top={0.5}>
             <Input onBlur={null} type="text" disabled={submitting} />
           </Margin>
@@ -145,6 +153,7 @@ export const KeyValue = ({
   disabled = false,
   input = 'input',
   type = 'metadata',
+  typeLabel = 'key',
   method = 'add',
   initialValues = {},
   error = null,
@@ -226,6 +235,7 @@ export const KeyValue = ({
               <InputKeyValue
                 onBlur={null}
                 type={type}
+                typeLabel={typeLabel}
                 submitting={submitting}
                 onlyName={onlyName}
                 onlyValue={onlyValue}