diff --git a/snippets/java/java.json b/snippets/java/java.json
index 4fab7155..25b87123 100644
--- a/snippets/java/java.json
+++ b/snippets/java/java.json
@@ -6,7 +6,7 @@
     },
     "class": {
         "prefix": "class",
-        "body": ["public class ${TM_FILENAME_BASE} {", "\t$0", "}"],
+        "body": ["public class ${1:TM_FILENAME_BASE} {", "\t$0", "}"],
         "description": "Public class"
     },
     "sysout": {
diff --git a/snippets/javascript/react-es7.json b/snippets/javascript/react-es7.json
index 0bdb4a25..27424330 100644
--- a/snippets/javascript/react-es7.json
+++ b/snippets/javascript/react-es7.json
@@ -17,12 +17,12 @@
             "",
             "type State = {}",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends Component<Props, State> {",
+            "export default class ${TM_FILENAME_BASE} extends Component<Props, State> {",
             "  state = {}",
             "",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}"
@@ -37,17 +37,17 @@
             "",
             "type State = {}",
             "",
-            "class ${1:${TM_FILENAME_BASE}} extends Component<Props, State> {",
+            "class ${TM_FILENAME_BASE} extends Component<Props, State> {",
             "  state = {}",
             "",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React component class with ES7 module system and TypeScript interfaces"
     },
@@ -57,13 +57,13 @@
 
             "type Props = {}",
             "",
-            "function ${1:${TM_FILENAME_BASE}}({}: Props) {",
+            "function ${TM_FILENAME_BASE}({}: Props) {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React Functional Component with ES7 module system and TypeScript interface"
     },
@@ -73,9 +73,9 @@
 
             "type Props = {}",
             "",
-            "export default function ${1:${TM_FILENAME_BASE}}({}: Props) {",
+            "export default function ${TM_FILENAME_BASE}({}: Props) {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}"
         ],
@@ -87,13 +87,13 @@
 
             "type Props = {}",
             "",
-            "const ${1:${TM_FILENAME_BASE}} = (props: Props) => {",
+            "const ${TM_FILENAME_BASE} = (props: Props) => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React Arrow Function Component with ES7 module system and TypeScript interface"
     },
@@ -103,9 +103,9 @@
 
             "type Props = {}",
             "",
-            "const ${1:${TM_FILENAME_BASE}} = (props: Props) => {",
+            "const ${TM_FILENAME_BASE} = (props: Props) => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}"
         ],
@@ -118,10 +118,10 @@
             "",
             "type Props = {}",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends PureComponent<Props> {",
+            "export default class ${TM_FILENAME_BASE} extends PureComponent<Props> {",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}"
@@ -135,15 +135,15 @@
             "",
             "type Props = {}",
             "",
-            "class ${1:${TM_FILENAME_BASE}} extends PureComponent<Props> {",
+            "class ${TM_FILENAME_BASE} extends PureComponent<Props> {",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React pure component class with ES7 module system and TypeScript interface"
     },
@@ -157,12 +157,12 @@
             "",
             "type State = {}",
             "",
-            "export class ${1:${TM_FILENAME_BASE}} extends Component<Props, State> {",
+            "export class ${TM_FILENAME_BASE} extends Component<Props, State> {",
             "  state = {}",
             "",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
@@ -171,7 +171,7 @@
             "",
             "const mapDispatchToProps = {}",
             "",
-            "export default connect(mapStateToProps, mapDispatchToProps)(${1:${TM_FILENAME_BASE}})"
+            "export default connect(mapStateToProps, mapDispatchToProps)(${TM_FILENAME_BASE})"
         ],
         "description": "Creates a React component class with connected redux and ES7 module system and TypeScript interfaces"
     },
@@ -182,15 +182,15 @@
 
             "type Props = {}",
             "",
-            "const ${1:${TM_FILENAME_BASE}} = (props: Props) => {",
+            "const ${TM_FILENAME_BASE} = (props: Props) => {",
             "  return (",
             "    <View>",
-            "      <Text>${1:first}</Text>",
+            "      <Text>${0}</Text>",
             "    </View>",
             "  )",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React Native Arrow Function Component with ES7 module system in TypeScript"
     },
@@ -201,15 +201,15 @@
 
             "type Props = {}",
             "",
-            "const ${1:${TM_FILENAME_BASE}} = (props: Props) => {",
+            "const ${TM_FILENAME_BASE} = (props: Props) => {",
             "  return (",
             "    <View>",
-            "      <Text>${1:first}</Text>",
+            "      <Text>${0}</Text>",
             "    </View>",
             "  )",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}",
+            "export default ${TM_FILENAME_BASE}",
             "",
             "const styles = StyleSheet.create({})"
         ],
@@ -218,10 +218,9 @@
     "reactArrowFunctionComponent": {
         "prefix": "rafc",
         "body": [
-
             "export const ${1:${TM_FILENAME_BASE}} = () => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             ""
@@ -234,29 +233,28 @@
 
             "import PropTypes from 'prop-types'",
             "",
-            "const ${1:${TM_FILENAME_BASE}} = props => {",
+            "const ${TM_FILENAME_BASE} = props => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             "",
-            "${1:${TM_FILENAME_BASE}}.propTypes = {}",
+            "${TM_FILENAME_BASE}.propTypes = {}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React Arrow Function Component with ES7 module system with PropTypes"
     },
     "reactArrowFunctionExportComponent": {
         "prefix": "rafce",
         "body": [
-
             "const ${1:${TM_FILENAME_BASE}} = () => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React Arrow Function Component with ES7 module system"
     },
@@ -265,10 +263,10 @@
         "body": [
             "import { Component } from 'react'",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends Component {",
+            "export default class ${TM_FILENAME_BASE} extends Component {",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
@@ -282,12 +280,12 @@
             "import PropTypes from 'prop-types'",
             "import { Component } from 'react'",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends Component {",
-            "  static propTypes = {${2:second}: ${3:third}}",
+            "export default class ${TM_FILENAME_BASE} extends Component {",
+            "  static propTypes = {${1:first}: ${2:second}}",
             "",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
@@ -301,10 +299,10 @@
             "import { Component } from 'react'",
             "import { connect } from 'react-redux'",
             "",
-            "export class ${1:${TM_FILENAME_BASE}} extends Component {",
+            "export class ${TM_FILENAME_BASE} extends Component {",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
@@ -313,7 +311,7 @@
             "",
             "const mapDispatchToProps = {}",
             "",
-            "export default connect(mapStateToProps, mapDispatchToProps)(${1:${TM_FILENAME_BASE}})"
+            "export default connect(mapStateToProps, mapDispatchToProps)(${TM_FILENAME_BASE})"
         ],
         "description": "Creates a React component class with connected redux and ES7 module system"
     },
@@ -324,14 +322,14 @@
             "import { Component } from 'react'",
             "import { connect } from 'react-redux'",
             "",
-            "export class ${1:${TM_FILENAME_BASE}} extends Component {",
+            "export class ${TM_FILENAME_BASE} extends Component {",
             "  static propTypes = {",
-            "    ${2:second}: ${3:third}",
+            "    ${1:first}: ${2:second}",
             "  }",
             "",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
@@ -340,7 +338,7 @@
             "",
             "const mapDispatchToProps = {}",
             "",
-            "export default connect(mapStateToProps, mapDispatchToProps)(${1:${TM_FILENAME_BASE}})"
+            "export default connect(mapStateToProps, mapDispatchToProps)(${TM_FILENAME_BASE})"
         ],
         "description": "Creates a React component class with PropTypes with connected redux and ES7 module system"
     },
@@ -349,15 +347,15 @@
         "body": [
             "import { Component } from 'react'",
             "",
-            "export class ${1:${TM_FILENAME_BASE}} extends Component {",
+            "export class ${TM_FILENAME_BASE} extends Component {",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React component class with ES7 module system"
     },
@@ -367,17 +365,17 @@
             "import PropTypes from 'prop-types'",
             "import { Component } from 'react'",
             "",
-            "export class ${1:${TM_FILENAME_BASE}} extends Component {",
+            "export class ${TM_FILENAME_BASE} extends Component {",
             "  static propTypes = {}",
             "",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React component class with ES7 module system"
     },
@@ -386,15 +384,15 @@
         "body": [
             "import { PureComponent } from 'react'",
             "",
-            "export class ${1:${TM_FILENAME_BASE}} extends PureComponent {",
+            "export class ${TM_FILENAME_BASE} extends PureComponent {",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React pure component class with ES7 module system export"
     },
@@ -403,10 +401,10 @@
         "body": [
             "import { PureComponent } from 'react'",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends PureComponent {",
+            "export default class ${TM_FILENAME_BASE} extends PureComponent {",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
@@ -420,12 +418,12 @@
             "import PropTypes from 'prop-types'",
             "import { PureComponent } from 'react'",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends PureComponent {",
+            "export default class ${TM_FILENAME_BASE} extends PureComponent {",
             "  static propTypes = {}",
             "",
             "  render() {",
             "    return (",
-            "      <div>${1:first}</div>",
+            "      <div>${0}</div>",
             "    )",
             "  }",
             "}",
@@ -438,13 +436,13 @@
         "body": [
             "import { memo } from 'react'",
             "",
-            "const ${1:${TM_FILENAME_BASE}} = memo(() => {",
+            "const ${TM_FILENAME_BASE} = memo(() => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "})",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React Memo Function Component with ES7 module system"
     },
@@ -454,25 +452,24 @@
             "import PropTypes from 'prop-types'",
             "import { memo } from 'react'",
             "",
-            "const ${1:${TM_FILENAME_BASE}} = memo((props) => {",
+            "const ${TM_FILENAME_BASE} = memo((props) => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "})",
             "",
-            "${1:${TM_FILENAME_BASE}}.propTypes = {}",
+            "${TM_FILENAME_BASE}.propTypes = {}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React Memo Function Component with ES7 module system with PropTypes"
     },
     "reactFunctionalComponent": {
         "prefix": "rfc",
         "body": [
-
             "export default function ${1:${TM_FILENAME_BASE}}() {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             ""
@@ -482,9 +479,9 @@
     "reactFunctionalViteComponent": {
         "prefix": "rfcv",
         "body": [
-            "export default function ${1:${TM_FILENAME_BASE}}() {",
+            "export default function ${TM_FILENAME_BASE}() {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             ""
@@ -497,9 +494,9 @@
 
             "import { connect } from 'react-redux'",
             "",
-            "export const ${1:${TM_FILENAME_BASE}} = (props) => {",
+            "export const ${TM_FILENAME_BASE} = (props) => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             "",
@@ -507,7 +504,7 @@
             "",
             "const mapDispatchToProps = {}",
             "",
-            "export default connect(mapStateToProps, mapDispatchToProps)(${1:${TM_FILENAME_BASE}})"
+            "export default connect(mapStateToProps, mapDispatchToProps)(${TM_FILENAME_BASE})"
         ],
         "description": "Creates a React functional component with connected redux and ES7 module system"
     },
@@ -518,21 +515,21 @@
 
             "import { connect } from 'react-redux'",
             "",
-            "export const ${1:${TM_FILENAME_BASE}} = (props) => {",
+            "export const ${TM_FILENAME_BASE} = (props) => {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             "",
-            "${1:${TM_FILENAME_BASE}}.propTypes = {",
-            "  ${2:second}: PropTypes.${3:third}",
+            "${TM_FILENAME_BASE}.propTypes = {",
+            "  ${1:first}: PropTypes.${2:second}",
             "}",
             "",
             "const mapStateToProps = (state) => ({})",
             "",
             "const mapDispatchToProps = {}",
             "",
-            "export default connect(mapStateToProps, mapDispatchToProps)(${1:${TM_FILENAME_BASE}})"
+            "export default connect(mapStateToProps, mapDispatchToProps)(${TM_FILENAME_BASE})"
         ],
         "description": "DEPRECATED: Creates a React functional component with PropTypes with connected redux and ES7 module system"
     },
@@ -542,15 +539,15 @@
 
             "import PropTypes from 'prop-types'",
             "",
-            "function ${1:${TM_FILENAME_BASE}}(props) {",
+            "function ${TM_FILENAME_BASE}(props) {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             "",
-            "${1:${TM_FILENAME_BASE}}.propTypes = {}",
+            "${TM_FILENAME_BASE}.propTypes = {}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}",
+            "export default ${TM_FILENAME_BASE}",
             ""
         ],
         "description": "Creates a React Functional Component with ES7 module system with PropTypes"
@@ -558,14 +555,13 @@
     "reactFunctionalExportComponent": {
         "prefix": "rfce",
         "body": [
-
             "function ${1:${TM_FILENAME_BASE}}() {",
             "  return (",
-            "    <div>${1:first}</div>",
+            "    <div>${0}</div>",
             "  )",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ],
         "description": "Creates a React Functional Component with ES7 module system"
     },
@@ -616,13 +612,13 @@
     },
     "consoleLogObject": {
         "prefix": "clo",
-        "body": ["console.log('${1:first}', ${1:first})"],
+        "body": ["console.log('${1:first}', ${2:second})"],
         "description": "Logs property with name."
     },
     "consoleLogJson": {
         "prefix": "clj",
         "body": [
-            "console.log('${1:first}', JSON.stringify(${1:first}, null, 2))"
+            "console.log('${1:first}', JSON.stringify(${2:second}, null, 2))"
         ],
         "description": "Logs stringified JSON property with name."
     },
@@ -671,12 +667,12 @@
         "prefix": "useEffectSnippet",
         "body": [
             "useEffect(() => {",
-            "  ${1:first}",
+            "  ${1:setup}",
             "",
             "  return () => {",
-            "    ${2:second}",
+            "    ${2:return}",
             "  }",
-            "}, [${3:third}])",
+            "}, [${3:dependencies?}])",
             ""
         ]
     },
@@ -721,7 +717,7 @@
     "useState": {
         "prefix": "useStateSnippet",
         "body": [
-            "const [${1:first}, set${1/(.*)/${1:/capitalize}/}] = useState(${2:second})"
+            "const [${1:state}, set${2:State}] = useState(${3:initValue})"
         ]
     },
     "importAs": {
@@ -982,11 +978,11 @@
             "import { Text, View } from 'react-native'",
             "import { Component } from 'react'",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends Component {",
+            "export default class ${TM_FILENAME_BASE} extends Component {",
             "  render() {",
             "    return (",
             "      <View>",
-            "        <Text>${1:first}</Text>",
+            "        <Text>${0}</Text>",
             "      </View>",
             "    )",
             "  }",
@@ -999,17 +995,17 @@
             "import { Text, View } from 'react-native'",
             "import { Component } from 'react'",
             "",
-            "export class ${1:${TM_FILENAME_BASE}} extends Component {",
+            "export class ${TM_FILENAME_BASE} extends Component {",
             "  render() {",
             "    return (",
             "      <View>",
-            "        <Text>${1:first}</Text>",
+            "        <Text>${0}</Text>",
             "      </View>",
             "    )",
             "  }",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ]
     },
     "reactNativeComponentWithStyles": {
@@ -1018,11 +1014,11 @@
             "import { Text, StyleSheet, View } from 'react-native'",
             "import { Component } from 'react'",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends Component {",
+            "export default class ${TM_FILENAME_BASE} extends Component {",
             "  render() {",
             "    return (",
             "      <View>",
-            "        <Text>${1:first}</Text>",
+            "        <Text>${0}</Text>",
             "      </View>",
             "    )",
             "  }",
@@ -1035,11 +1031,11 @@
         "prefix": "rnf",
         "body": [
             "import { View, Text } from 'react-native'",
-
+            "",
             "export default function ${1:${TM_FILENAME_BASE}}() {",
             "  return (",
             "    <View>",
-            "      <Text>${1:first}</Text>",
+            "      <Text>${0}</Text>",
             "    </View>",
             "  )",
             "}"
@@ -1049,11 +1045,11 @@
         "prefix": "rnfs",
         "body": [
             "import { StyleSheet, Text, View } from 'react-native'",
-
+            "",
             "export default function ${1:${TM_FILENAME_BASE}}() {",
             "  return (",
             "    <View>",
-            "      <Text>${1:first}</Text>",
+            "      <Text>${0}</Text>",
             "    </View>",
             "  )",
             "}",
@@ -1065,32 +1061,32 @@
         "prefix": "rnfe",
         "body": [
             "import { View, Text } from 'react-native'",
-
+            "",
             "const ${1:${TM_FILENAME_BASE}} = () => {",
             "  return (",
             "    <View>",
-            "      <Text>${1:first}</Text>",
+            "      <Text>${0}</Text>",
             "    </View>",
             "  )",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ]
     },
     "reactNativeFunctionalExportComponentWithStyles": {
         "prefix": "rnfes",
         "body": [
             "import { StyleSheet, Text, View } from 'react-native'",
-
+            "",
             "const ${1:${TM_FILENAME_BASE}} = () => {",
             "  return (",
             "    <View>",
-            "      <Text>${1:first}</Text>",
+            "      <Text>${0}</Text>",
             "    </View>",
             "  )",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}",
+            "export default ${TM_FILENAME_BASE}",
             "",
             "const styles = StyleSheet.create({})"
         ]
@@ -1105,11 +1101,11 @@
             "import { Text, View } from 'react-native'",
             "import { PureComponent } from 'react'",
             "",
-            "export default class ${1:${TM_FILENAME_BASE}} extends PureComponent {",
+            "export default class ${TM_FILENAME_BASE} extends PureComponent {",
             "  render() {",
             "    return (",
             "      <View>",
-            "        <Text>${1:first}</Text>",
+            "        <Text>${0}</Text>",
             "      </View>",
             "    )",
             "  }",
@@ -1122,17 +1118,17 @@
             "import { Text, View } from 'react-native'",
             "import { PureComponent } from 'react'",
             "",
-            "export class ${1:${TM_FILENAME_BASE}} extends PureComponent {",
+            "export class ${TM_FILENAME_BASE} extends PureComponent {",
             "  render() {",
             "    return (",
             "      <View>",
-            "        <Text>${1:first}</Text>",
+            "        <Text>${0}</Text>",
             "      </View>",
             "    )",
             "  }",
             "}",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}"
+            "export default ${TM_FILENAME_BASE}"
         ]
     },
     "reactNativeStyles": {
@@ -1155,7 +1151,7 @@
     },
     "reduxConst": {
         "prefix": "rxconst",
-        "body": ["export const ${1:first} = '${1:first}'"]
+        "body": ["export const ${1:first} = '${2:second}'"]
     },
     "reduxReducer": {
         "prefix": "rxreducer",
@@ -1192,15 +1188,15 @@
             "",
             "}",
             "",
-            "const ${1:${TM_FILENAME_BASE}} = createSlice({",
-            "  name: ${2:second},",
+            "const ${TM_FILENAME_BASE} = createSlice({",
+            "  name: ${0},",
             "  initialState,",
             "  reducers: {}",
             "});",
             "",
-            "export const {} = ${1:${TM_FILENAME_BASE}}.actions",
+            "export const {} = ${TM_FILENAME_BASE}.actions",
             "",
-            "export default ${1:${TM_FILENAME_BASE}}.reducer"
+            "export default ${TM_FILENAME_BASE}.reducer"
         ]
     },
     "mappingToProps": {
@@ -1234,13 +1230,13 @@
             "import { Provider } from 'react-redux'",
             "",
             "import store from '~/store'",
-            "import { ${1:${TM_FILENAME_BASE}} } from '../${1:${TM_FILENAME_BASE}}'",
+            "import { ${TM_FILENAME_BASE} } from '../${TM_FILENAME_BASE}'",
             "",
-            "describe('<${1:${TM_FILENAME_BASE}} />', () => {",
+            "describe('<${TM_FILENAME_BASE} />', () => {",
             "  const defaultProps = {}",
             "  const wrapper = renderer.create(",
             "    <Provider store={store}>",
-            "     <${1:${TM_FILENAME_BASE}} {...defaultProps} />",
+            "     <${TM_FILENAME_BASE} {...defaultProps} />",
             "    </Provider>,",
             "  )",
             "",
@@ -1258,11 +1254,11 @@
 
             "import renderer from 'react-test-renderer'",
             "",
-            "import ${1:${TM_FILENAME_BASE}} from '../${1:${TM_FILENAME_BASE}}'",
+            "import ${TM_FILENAME_BASE} from '../${TM_FILENAME_BASE}'",
             "",
-            "describe('<${1:${TM_FILENAME_BASE}} />', () => {",
+            "describe('<${TM_FILENAME_BASE} />', () => {",
             "  const defaultProps = {}",
-            "  const wrapper = renderer.create(<${1:${TM_FILENAME_BASE}} {...defaultProps} />)",
+            "  const wrapper = renderer.create(<${TM_FILENAME_BASE} {...defaultProps} />)",
             "",
             "  test('render', () => {",
             "    expect(wrapper).toMatchSnapshot()",
@@ -1279,13 +1275,13 @@
             "import { Provider } from 'react-redux'",
             "",
             "import store from '~/store'",
-            "import ${1:${TM_FILENAME_BASE}} from '../${1:${TM_FILENAME_BASE}}'",
+            "import ${TM_FILENAME_BASE} from '../${TM_FILENAME_BASE}'",
             "",
-            "describe('<${1:${TM_FILENAME_BASE}} />', () => {",
+            "describe('<${TM_FILENAME_BASE} />', () => {",
             "  const defaultProps = {}",
             "  const wrapper = renderer.create(",
             "    <Provider store={store}>",
-            "      <${1:${TM_FILENAME_BASE}} {...defaultProps} />",
+            "      <${TM_FILENAME_BASE} {...defaultProps} />",
             "    </Provider>,",
             "  )",
             "",
@@ -1301,11 +1297,11 @@
 
             "import renderer from 'react-test-renderer'",
             "",
-            "import { ${1:${TM_FILENAME_BASE}} } from '../${1:${TM_FILENAME_BASE}}'",
+            "import { ${TM_FILENAME_BASE} } from '../${TM_FILENAME_BASE}'",
             "",
-            "describe('<${1:${TM_FILENAME_BASE}} />', () => {",
+            "describe('<${TM_FILENAME_BASE} />', () => {",
             "  const defaultProps = {}",
-            "  const wrapper = renderer.create(<${1:${TM_FILENAME_BASE}} {...defaultProps} />)",
+            "  const wrapper = renderer.create(<${TM_FILENAME_BASE} {...defaultProps} />)",
             "",
             "  test('render', () => {",
             "    expect(wrapper).toMatchSnapshot()",
@@ -1508,7 +1504,7 @@
     },
     "bindThis": {
         "prefix": "bnd",
-        "body": ["this.${1:first} = this.${1:first}.bind(this)"],
+        "body": ["this.${1:first} = this.${2:second}.bind(this)"],
         "description": "Binds this to a method"
     },
     "commentBigBlock": {
@@ -1534,7 +1530,7 @@
             "  return hocComponent",
             "}",
             "",
-            "export default WrapperComponent => connect(mapStateToProps, mapDispatchToProps)(${1:first}(WrapperComponent))",
+            "export default WrapperComponent => connect(mapStateToProps, mapDispatchToProps)(${2:second}(WrapperComponent))",
             ""
         ]
     },