diff --git a/src/lib/libraries/decks/en-steps.js b/src/lib/libraries/decks/en-steps.js
index adff8a5ee..ce302ae65 100644
--- a/src/lib/libraries/decks/en-steps.js
+++ b/src/lib/libraries/decks/en-steps.js
@@ -1,188 +1,187 @@
 // Intro
-import stepMove from './steps/getting-started1.en.gif';
-import stepMoveSayHello from './steps/getting-started2.en.gif';
+import introMove from './steps/intro-move.en.gif';
+import introSayHello from './steps/intro-say-hello.en.gif';
 
 // Text to Speech
-import stepAddSpeechExtension from './steps/speech-01-add-extensions.en.gif';
-import stepSpeechSpeak from './steps/speech-02-say-something.en.gif';
-import stepSpeechSetVoice from './steps/speech-03-set-voice.en.gif';
-import stepSpeechMove from './steps/speech-04-move-around.en.gif';
-import stepSpeechBackdrop from './steps/speech-05-add-backdrop.en.gif';
-import stepSpeechAddSprite from './steps/speech-06-add-character.en.gif';
-import stepSpeechSong from './steps/speech-07-perform-song.en.gif';
-import stepSpeechColor from './steps/speech-08-color-click.en.gif';
-import stepSpeechSpin from './steps/speech-09-spin.en.gif';
-import stepSpeechGrow from './steps/speech-10-grow-shrink.en.gif';
+import speechAddExtension from './steps/speech-add-extension.en.gif';
+import speechSaySomething from './steps/speech-say-something.en.gif';
+import speechSetVoice from './steps/speech-set-voice.en.gif';
+import speechMoveAround from './steps/speech-move-around.en.gif';
+import speechAddBackdrop from './steps/speech-add-backdrop.en.gif';
+import speechAddSprite from './steps/speech-add-sprite.en.gif';
+import speechSong from './steps/speech-song.en.gif';
+import speechChangeColor from './steps/speech-change-color.en.gif';
+import speechSpin from './steps/speech-spin.en.gif';
+import speechGrowShrink from './steps/speech-grow-shrink.en.gif';
 
 // Cartoon Network
-import stepCNcharacter from './steps/cn-1-hideshow.en.gif';
-import stepCNsay from './steps/cn-2-say.en.gif';
-import stepCNglide from './steps/cn-3-glide.en.gif';
-import stepCNpicksprite from './steps/cn-4-pick-gem.en.gif';
-import stepCNcollect from './steps/cn-5-collect.en.gif';
-import stepCNvariable from './steps/cn-6-variable.en.gif';
-import stepCNscore from './steps/cn-7-score.en.gif';
-import stepCNbackdrop from './steps/cn-8-change-backdrop.en.gif';
+import cnShowCharacter from './steps/cn-show-character.en.gif';
+import cnSay from './steps/cn-say.en.gif';
+import cnGlide from './steps/cn-glide.en.gif';
+import cnPickSprite from './steps/cn-pick-sprite.en.gif';
+import cnCollect from './steps/cn-collect.en.gif';
+import cnVariable from './steps/cn-variable.en.gif';
+import cnScore from './steps/cn-score.en.gif';
+import cnBackdrop from './steps/cn-backdrop.en.gif';
 
 // Add sprite
-import stepAddSprite from './steps/add-sprite.en.gif';
+import addSprite from './steps/add-sprite.en.gif';
 
 // Animate a name
-import stepAnimatePickLetter from './steps/animate-name-pick-a-letter.en.gif';
-import stepAnimatePlaySound from './steps/animate-name-play-sound.en.gif';
-import stepAnimatePickLetter2 from './steps/animate-name-pick-a-letter2.en.gif';
-import stepAnimateChangeColor from './steps/animate-name-change-color.en.gif';
-import stepAnimateSpin from './steps/animate-name-spin.en.gif';
-import stepAnimateGrow from './steps/animate-name-grow.en.gif';
+import namePickLetter from './steps/name-pick-letter.en.gif';
+import namePlaySound from './steps/name-play-sound.en.gif';
+import namePickLetter2 from './steps/name-pick-letter2.en.gif';
+import nameChangeColor from './steps/name-change-color.en.gif';
+import nameSpin from './steps/name-spin.en.gif';
+import nameGrow from './steps/name-grow.en.gif';
 
 // Make-Music
-import stepPickInstrument from './steps/make-music-pick-instrument.en.gif';
-import stepPlaySoundClick from './steps/make-music-play-sound.en.gif';
-import stepMakeSong from './steps/make-music-make-song.en.gif';
-import stepMakeBeat from './steps/make-music-make-beat.en.gif';
-import stepMakeBeatbox from './steps/make-music-beatbox.en.gif';
+import musicPickInstrument from './steps/music-pick-instrument.en.gif';
+import musicPlaySound from './steps/music-play-sound.en.gif';
+import musicMakeSong from './steps/music-make-song.en.gif';
+import musicMakeBeat from './steps/music-make-beat.en.gif';
+import musicMakeBeatbox from './steps/music-make-beatbox.en.gif';
 
 // Chase-Game
-import stepBG from './steps/chase-game-add-backdrop.en.gif';
-import stepAddOcto from './steps/chase-game-add-sprite1.en.gif';
-import stepLeftRight from './steps/chase-game-move-rightleft.en.gif';
-import stepUpDown from './steps/chase-game-move-updown.en.gif';
-import stepAddStar from './steps/chase-game-add-sprite2.en.gif';
-import stepMoveRandom from './steps/chase-game-move-randomly.en.gif';
-import stepWhenTouch from './steps/chase-game-touching.en.gif';
-import stepScoreVariable from './steps/chase-game-add-variable.en.gif';
-import stepScoreWhenTouch from './steps/chase-game-change-score.en.gif';
+import chaseGameAddBackdrop from './steps/chase-game-add-backdrop.en.gif';
+import chaseGameAddSprite1 from './steps/chase-game-add-sprite1.en.gif';
+import chaseGameRightLeft from './steps/chase-game-right-left.en.gif';
+import chaseGameUpDown from './steps/chase-game-up-down.en.gif';
+import chaseGameAddSprite2 from './steps/chase-game-add-sprite2.en.gif';
+import chaseGameMoveRandomly from './steps/chase-game-move-randomly.en.gif';
+import chaseGamePlaySound from './steps/chase-game-play-sound.en.gif';
+import chaseGameAddVariable from './steps/chase-game-add-variable.en.gif';
+import chaseGameChangeScore from './steps/chase-game-change-score.en.gif';
 
-// Make-A-Game
-import stepGamePickSprite from './steps/pop-game-pick-sprite.en.gif';
-import stepGamePlaySound from './steps/pop-game-play-sound.en.gif';
-import stepGameAddScore from './steps/pop-game-add-score.en.gif';
-import stepGameChangeScore from './steps/pop-game-change-score.en.gif';
-import stepRandom from './steps/pop-game-random-position.en.gif';
-import stepGameChangeColor from './steps/pop-game-change-color.en.gif';
-import stepResetScore from './steps/pop-game-reset-score.en.gif';
+// Clicker-Game (Pop Game)
+import popGamePickSprite from './steps/pop-game-pick-sprite.en.gif';
+import popGamePlaySound from './steps/pop-game-play-sound.en.gif';
+import popGameAddScore from './steps/pop-game-add-score.en.gif';
+import popGameChangeScore from './steps/pop-game-change-score.en.gif';
+import popGameRandomPosition from './steps/pop-game-random-position.en.gif';
+import popGameChangeColor from './steps/pop-game-change-color.en.gif';
+import popGameResetScore from './steps/pop-game-reset-score.en.gif';
 
 // Animate A Character
-import stepAnimateCharPickBackdrop from './steps/animate-char-pick-backdrop.en.gif';
-import stepAnimateCharPickSprite from './steps/animate-char-pick-sprite.en.gif';
-import stepAnimateCharSaySomething from './steps/animate-char-say-something.en.gif';
-import stepAnimateCharAddSound from './steps/animate-char-add-sound.en.gif';
-import stepAnimateCharTalk from './steps/animate-char-talk.en.gif';
-import stepAnimateCharMove from './steps/animate-char-move.en.gif';
-import stepAnimateCharJump from './steps/animate-char-jump.en.gif';
-import stepAnimateCharChangeColor from './steps/animate-char-change-color.en.gif';
+import animateCharPickBackdrop from './steps/animate-char-pick-backdrop.en.gif';
+import animateCharPickSprite from './steps/animate-char-pick-sprite.en.gif';
+import animateCharSaySomething from './steps/animate-char-say-something.en.gif';
+import animateCharAddSound from './steps/animate-char-add-sound.en.gif';
+import animateCharTalk from './steps/animate-char-talk.en.gif';
+import animateCharMove from './steps/animate-char-move.en.gif';
+import animateCharJump from './steps/animate-char-jump.en.gif';
+import animateCharChangeColor from './steps/animate-char-change-color.en.gif';
 
 // Tell A Story
-import stepStoryPickBackdrop from './steps/story-pick-backdrop.en.gif';
-import stepStoryPickSprite from './steps/story-pick-sprite.en.gif';
-import stepStoryCharSaySomething from './steps/story-say-something.en.gif';
-import stepStoryCharAddAnotherSprite from './steps/story-pick-another-sprite.en.gif';
-import stepStoryFlip from './steps/story-flip.en.gif';
-import stepStoryConversation from './steps/story-conversation.en.gif';
-import stepStoryAddAnotherBackdrop from './steps/story-add-background-2.en.gif';
-import stepStorySwitchBackdrop from './steps/story-switch-backdrop.en.gif';
-import stepStoryHide from './steps/story-hide-character.en.gif';
-import stepStoryShow from './steps/story-show-character.en.gif';
+import storyPickBackdrop from './steps/story-pick-backdrop.en.gif';
+import storyPickSprite from './steps/story-pick-sprite.en.gif';
+import storySaySomething from './steps/story-say-something.en.gif';
+import storyPickSprite2 from './steps/story-pick-sprite2.en.gif';
+import storyFlip from './steps/story-flip.en.gif';
+import storyConversation from './steps/story-conversation.en.gif';
+import storyPickBackdrop2 from './steps/story-pick-backdrop2.en.gif';
+import storySwitchBackdrop from './steps/story-switch-backdrop.en.gif';
+import storyHideCharacter from './steps/story-hide-character.en.gif';
+import storyShowCharacter from './steps/story-show-character.en.gif';
 
 // Video Sensing
-import stepVideoSensAddExtension from './steps/videosens-add-extension.en.gif';
-import stepVideoSensPet from './steps/videosens-pet-cat.en.gif';
-import stepVideoSensAnimate from './steps/videosens-animate.en.gif';
-import stepVideoSensPop from './steps/videosens-pop.en.gif';
+import videoAddExtension from './steps/video-add-extension.en.gif';
+import videoPet from './steps/video-pet.en.gif';
+import videoAnimate from './steps/video-animate.en.gif';
+import videoPop from './steps/video-pop.en.gif';
 
 const enImages = {
     // Intro
-    stepMove: stepMove,
-    stepMoveSayHello: stepMoveSayHello,
+    introMove: introMove,
+    introSayHello: introSayHello,
 
     // Text to Speech
-    stepAddSpeechExtension: stepAddSpeechExtension,
-    stepSpeechSpeak: stepSpeechSpeak,
-    stepSpeechSetVoice: stepSpeechSetVoice,
-    stepSpeechMove: stepSpeechMove,
-    stepSpeechBackdrop: stepSpeechBackdrop,
-    stepSpeechAddSprite: stepSpeechAddSprite,
-    stepSpeechSong: stepSpeechSong,
-    stepSpeechColor: stepSpeechColor,
-    stepSpeechSpin: stepSpeechSpin,
-    stepSpeechGrow: stepSpeechGrow,
+    speechAddExtension: speechAddExtension,
+    speechSaySomething: speechSaySomething,
+    speechSetVoice: speechSetVoice,
+    speechMoveAround: speechMoveAround,
+    speechAddBackdrop: speechAddBackdrop,
+    speechAddSprite: speechAddSprite,
+    speechSong: speechSong,
+    speechChangeColor: speechChangeColor,
+    speechSpin: speechSpin,
+    speechGrowShrink: speechGrowShrink,
 
     // Cartoon Network
-    stepCNcharacter: stepCNcharacter,
-    stepCNsay: stepCNsay,
-    stepCNglide: stepCNglide,
-    stepCNpicksprite: stepCNpicksprite,
-    stepCNcollect: stepCNcollect,
-    stepCNvariable: stepCNvariable,
-    stepCNscore: stepCNscore,
-    stepCNbackdrop: stepCNbackdrop,
+    cnShowCharacter: cnShowCharacter,
+    cnSay: cnSay,
+    cnGlide: cnGlide,
+    cnPickSprite: cnPickSprite,
+    cnCollect: cnCollect,
+    cnVariable: cnVariable,
+    cnScore: cnScore,
+    cnBackdrop: cnBackdrop,
 
     // Add sprite
-    stepAddSprite: stepAddSprite,
+    addSprite: addSprite,
 
     // Animate a name
-    stepAnimatePickLetter: stepAnimatePickLetter,
-    stepAnimatePlaySound: stepAnimatePlaySound,
-    stepAnimatePickLetter2: stepAnimatePickLetter2,
-    stepAnimateChangeColor: stepAnimateChangeColor,
-    stepAnimateSpin: stepAnimateSpin,
-    stepAnimateGrow: stepAnimateGrow,
-
+    namePickLetter: namePickLetter,
+    namePlaySound: namePlaySound,
+    namePickLetter2: namePickLetter2,
+    nameChangeColor: nameChangeColor,
+    nameSpin: nameSpin,
+    nameGrow: nameGrow,
 
     // Make-Music
-    stepPickInstrument: stepPickInstrument,
-    stepPlaySoundClick: stepPlaySoundClick,
-    stepMakeSong: stepMakeSong,
-    stepMakeBeat: stepMakeBeat,
-    stepMakeBeatbox: stepMakeBeatbox,
+    musicPickInstrument: musicPickInstrument,
+    musicPlaySound: musicPlaySound,
+    musicMakeSong: musicMakeSong,
+    musicMakeBeat: musicMakeBeat,
+    musicMakeBeatbox: musicMakeBeatbox,
 
     // Chase-Game
-    stepBG: stepBG,
-    stepAddOcto: stepAddOcto,
-    stepLeftRight: stepLeftRight,
-    stepUpDown: stepUpDown,
-    stepAddStar: stepAddStar,
-    stepMoveRandom: stepMoveRandom,
-    stepWhenTouch: stepWhenTouch,
-    stepScoreVariable: stepScoreVariable,
-    stepScoreWhenTouch: stepScoreWhenTouch,
+    chaseGameAddBackdrop: chaseGameAddBackdrop,
+    chaseGameAddSprite1: chaseGameAddSprite1,
+    chaseGameRightLeft: chaseGameRightLeft,
+    chaseGameUpDown: chaseGameUpDown,
+    chaseGameAddSprite2: chaseGameAddSprite2,
+    chaseGameMoveRandomly: chaseGameMoveRandomly,
+    chaseGamePlaySound: chaseGamePlaySound,
+    chaseGameAddVariable: chaseGameAddVariable,
+    chaseGameChangeScore: chaseGameChangeScore,
 
-    // Make-A-Game
-    stepGamePickSprite: stepGamePickSprite,
-    stepGamePlaySound: stepGamePlaySound,
-    stepGameAddScore: stepGameAddScore,
-    stepGameChangeScore: stepGameChangeScore,
-    stepRandom: stepRandom,
-    stepGameChangeColor: stepGameChangeColor,
-    stepResetScore: stepResetScore,
+    // Make-A-Pop/Clicker Game
+    popGamePickSprite: popGamePickSprite,
+    popGamePlaySound: popGamePlaySound,
+    popGameAddScore: popGameAddScore,
+    popGameChangeScore: popGameChangeScore,
+    popGameRandomPosition: popGameRandomPosition,
+    popGameChangeColor: popGameChangeColor,
+    popGameResetScore: popGameResetScore,
 
     // Animate A Character
-    stepAnimateCharPickBackdrop: stepAnimateCharPickBackdrop,
-    stepAnimateCharPickSprite: stepAnimateCharPickSprite,
-    stepAnimateCharSaySomething: stepAnimateCharSaySomething,
-    stepAnimateCharAddSound: stepAnimateCharAddSound,
-    stepAnimateCharTalk: stepAnimateCharTalk,
-    stepAnimateCharMove: stepAnimateCharMove,
-    stepAnimateCharJump: stepAnimateCharJump,
-    stepAnimateCharChangeColor: stepAnimateCharChangeColor,
+    animateCharPickBackdrop: animateCharPickBackdrop,
+    animateCharPickSprite: animateCharPickSprite,
+    animateCharSaySomething: animateCharSaySomething,
+    animateCharAddSound: animateCharAddSound,
+    animateCharTalk: animateCharTalk,
+    animateCharMove: animateCharMove,
+    animateCharJump: animateCharJump,
+    animateCharChangeColor: animateCharChangeColor,
 
     // Tell A Story
-    stepStoryPickBackdrop: stepStoryPickBackdrop,
-    stepStoryPickSprite: stepStoryPickSprite,
-    stepStoryCharSaySomething: stepStoryCharSaySomething,
-    stepStoryCharAddAnotherSprite: stepStoryCharAddAnotherSprite,
-    stepStoryFlip: stepStoryFlip,
-    stepStoryConversation: stepStoryConversation,
-    stepStoryAddAnotherBackdrop: stepStoryAddAnotherBackdrop,
-    stepStorySwitchBackdrop: stepStorySwitchBackdrop,
-    stepStoryHide: stepStoryHide,
-    stepStoryShow: stepStoryShow,
+    storyPickBackdrop: storyPickBackdrop,
+    storyPickSprite: storyPickSprite,
+    storySaySomething: storySaySomething,
+    storyPickSprite2: storyPickSprite2,
+    storyFlip: storyFlip,
+    storyConversation: storyConversation,
+    storyPickBackdrop2: storyPickBackdrop2,
+    storySwitchBackdrop: storySwitchBackdrop,
+    storyHideCharacter: storyHideCharacter,
+    storyShowCharacter: storyShowCharacter,
 
     // Video Sensing
-    stepVideoSensAddExtension: stepVideoSensAddExtension,
-    stepVideoSensPet: stepVideoSensPet,
-    stepVideoSensAnimate: stepVideoSensAnimate,
-    stepVideoSensPop: stepVideoSensPop
+    videoAddExtension: videoAddExtension,
+    videoPet: videoPet,
+    videoAnimate: videoAnimate,
+    videoPop: videoPop
 
 };
 
diff --git a/src/lib/libraries/decks/es-steps.js b/src/lib/libraries/decks/es-steps.js
index 74178e280..f46c63a38 100644
--- a/src/lib/libraries/decks/es-steps.js
+++ b/src/lib/libraries/decks/es-steps.js
@@ -1,187 +1,188 @@
 // Intro
-import stepMove from './steps/getting-started1.es.gif';
-import stepMoveSayHello from './steps/getting-started2.es.gif';
-
-// // Text to Speech
-// import stepAddSpeechextension from './txt/01_hoc-add-extensions.es.gif';
-// import stepSpeechSpeak from './txt/02_hoc-say-something.es.gif';
-// import stepSpeechSetVoice from './txt/03_hoc-set-voice.es.gif';
-// import stepSpeechMove from './txt/04_hoc-move-around.es.gif';
-// import stepSpeechBackdrop from './txt/05_hoc-add-backdrop.es.gif';
-// import stepSpeechAddSprite from './txt/06_hoc-add-character.es.gif';
-// import stepSpeechSong from './txt/07_hoc-perform-song.es.gif';
-// import stepSpeechColor from './txt/08_hoc-color-click.es.gif';
-// import stepSpeechSpin from './txt/09_hoc-spin.es.gif';
-// import stepSpeechGrow from './txt/10_hoc-grow-shrink.es.gif';
+import introMove from './steps/intro-move.es.gif';
+import introSayHello from './steps/intro-say-hello.es.gif';
 
+// Text to Speech
+// import speechAddExtension from './steps/speech-add-extension.es.gif';
+// import speechSaySomething from './steps/speech-say-something.es.gif';
+// import speechSetVoice from './steps/speech-set-voice.es.gif';
+// import speechMoveAround from './steps/speech-move-around.es.gif';
+// import speechAddBackdrop from './steps/speech-add-backdrop.es.gif';
+// import speechAddSprite from './steps/speech-add-sprite.es.gif';
+// import speechSong from './steps/speech-song.es.gif';
+// import speechChangeColor from './steps/speech-change-color.es.gif';
+// import speechSpin from './steps/speech-spin.es.gif';
+// import speechGrowShrink from './steps/speech-grow-shrink.es.gif';
+//
 // // Cartoon Network
-// import stepCNcharacter from './cartoonnetwork/1-cn-hideshow.es.gif';
-// import stepCNsay from './cartoonnetwork/2-cn-say.es.gif';
-// import stepCNglide from './cartoonnetwork/3-cn-glide.es.gif';
-// import stepCNpicksprite from './cartoonnetwork/4-cn-pick-gem.es.gif';
-// import stepCNcollect from './cartoonnetwork/5-cn-collect.es.gif';
-// import stepCNvariable from './cartoonnetwork/6-cn-variable.es.gif';
-// import stepCNscore from './cartoonnetwork/7-cn-score.es.gif';
-// import stepCNbackdrop from './cartoonnetwork/8-cn-change-backdrop.es.gif';
+// import cnShowCharacter from './steps/cn-show-character.es.gif';
+// import cnSay from './steps/cn-say.es.gif';
+// import cnGlide from './steps/cn-glide.es.gif';
+// import cnPickSprite from './steps/cn-pick-sprite.es.gif';
+// import cnCollect from './steps/cn-collect.es.gif';
+// import cnVariable from './steps/cn-variable.es.gif';
+// import cnScore from './steps/cn-score.es.gif';
+// import cnBackdrop from './steps/cn-backdrop.es.gif';
 
 // Add sprite
-import stepAddSprite from './steps/add-sprite.es.gif';
+import addSprite from './steps/add-sprite.es.gif';
 
 // Animate a name
-import stepAnimatePickLetter from './steps/animate-name-pick-a-letter.es.gif';
-import stepAnimatePlaySound from './steps/animate-name-play-sound.es.gif';
-import stepAnimatePickLetter2 from './steps/animate-name-pick-a-letter2.es.gif';
-import stepAnimateChangeColor from './steps/animate-name-change-color.es.gif';
-import stepAnimateSpin from './steps/animate-name-spin.es.gif';
-import stepAnimateGrow from './steps/animate-name-grow.es.gif';
+import namePickLetter from './steps/name-pick-letter.es.gif';
+import namePlaySound from './steps/name-play-sound.es.gif';
+import namePickLetter2 from './steps/name-pick-letter2.es.gif';
+import nameChangeColor from './steps/name-change-color.es.gif';
+import nameSpin from './steps/name-spin.es.gif';
+import nameGrow from './steps/name-grow.es.gif';
 
 // Make-Music
-import stepPickInstrument from './steps/make-music-pick-instrument.es.gif';
-import stepPlaySoundClick from './steps/make-music-play-sound.es.gif';
-import stepMakeSong from './steps/make-music-make-song.es.gif';
-import stepMakeBeat from './steps/make-music-make-beat.es.gif';
-import stepMakeBeatbox from './steps/make-music-beatbox.es.gif';
+import musicPickInstrument from './steps/music-pick-instrument.es.gif';
+import musicPlaySound from './steps/music-play-sound.es.gif';
+import musicMakeSong from './steps/music-make-song.es.gif';
+import musicMakeBeat from './steps/music-make-beat.es.gif';
+import musicMakeBeatbox from './steps/music-make-beatbox.es.gif';
 
 // Chase-Game
-import stepBG from './steps/chase-game-add-backdrop.es.gif';
-import stepAddOcto from './steps/chase-game-add-sprite1.es.gif';
-import stepLeftRight from './steps/chase-game-move-rightleft.es.gif';
-import stepUpDown from './steps/chase-game-move-updown.es.gif';
-import stepAddStar from './steps/chase-game-add-sprite2.es.gif';
-import stepMoveRandom from './steps/chase-game-move-randomly.es.gif';
-import stepWhenTouch from './steps/chase-game-touching.es.gif';
-import stepScoreVariable from './steps/chase-game-add-variable.es.gif';
-import stepScoreWhenTouch from './steps/chase-game-change-score.es.gif';
+import chaseGameAddBackdrop from './steps/chase-game-add-backdrop.es.gif';
+import chaseGameAddSprite1 from './steps/chase-game-add-sprite1.es.gif';
+import chaseGameRightLeft from './steps/chase-game-right-left.es.gif';
+import chaseGameUpDown from './steps/chase-game-up-down.es.gif';
+import chaseGameAddSprite2 from './steps/chase-game-add-sprite2.es.gif';
+import chaseGameMoveRandomly from './steps/chase-game-move-randomly.es.gif';
+import chaseGamePlaySound from './steps/chase-game-play-sound.es.gif';
+import chaseGameAddVariable from './steps/chase-game-add-variable.es.gif';
+import chaseGameChangeScore from './steps/chase-game-change-score.es.gif';
 
-// Make-A-Game
-import stepGamePickSprite from './steps/pop-game-pick-sprite.es.gif';
-import stepGamePlaySound from './steps/pop-game-play-sound.es.gif';
-import stepGameAddScore from './steps/pop-game-add-score.es.gif';
-import stepGameChangeScore from './steps/pop-game-change-score.es.gif';
-import stepRandom from './steps/pop-game-random-position.es.gif';
-import stepGameChangeColor from './steps/pop-game-change-color.es.gif';
-import stepResetScore from './steps/pop-game-reset-score.es.gif';
+// Clicker-Game (Pop Game)
+import popGamePickSprite from './steps/pop-game-pick-sprite.es.gif';
+import popGamePlaySound from './steps/pop-game-play-sound.es.gif';
+import popGameAddScore from './steps/pop-game-add-score.es.gif';
+import popGameChangeScore from './steps/pop-game-change-score.es.gif';
+import popGameRandomPosition from './steps/pop-game-random-position.es.gif';
+import popGameChangeColor from './steps/pop-game-change-color.es.gif';
+import popGameResetScore from './steps/pop-game-reset-score.es.gif';
 
 // Animate A Character
-import stepAnimateCharPickBackdrop from './steps/animate-char-pick-backdrop.es.gif';
-import stepAnimateCharPickSprite from './steps/animate-char-pick-sprite.es.gif';
-import stepAnimateCharSaySomething from './steps/animate-char-say-something.es.gif';
-import stepAnimateCharAddSound from './steps/animate-char-add-sound.es.gif';
-import stepAnimateCharTalk from './steps/animate-char-talk.es.gif';
-import stepAnimateCharMove from './steps/animate-char-move.es.gif';
-import stepAnimateCharJump from './steps/animate-char-jump.es.gif';
-import stepAnimateCharChangeColor from './steps/animate-char-change-color.es.gif';
+import animateCharPickBackdrop from './steps/animate-char-pick-backdrop.es.gif';
+import animateCharPickSprite from './steps/animate-char-pick-sprite.es.gif';
+import animateCharSaySomething from './steps/animate-char-say-something.es.gif';
+import animateCharAddSound from './steps/animate-char-add-sound.es.gif';
+import animateCharTalk from './steps/animate-char-talk.es.gif';
+import animateCharMove from './steps/animate-char-move.es.gif';
+import animateCharJump from './steps/animate-char-jump.es.gif';
+import animateCharChangeColor from './steps/animate-char-change-color.es.gif';
 
 // Tell A Story
-import stepStoryPickBackdrop from './steps/story-pick-backdrop.es.gif';
-import stepStoryPickSprite from './steps/story-pick-sprite.es.gif';
-import stepStoryCharSaySomething from './steps/story-say-something.es.gif';
-import stepStoryCharAddAnotherSprite from './steps/story-pick-another-sprite.es.gif';
-import stepStoryFlip from './steps/story-flip.es.gif';
-import stepStoryConversation from './steps/story-conversation.es.gif';
-import stepStoryAddAnotherBackdrop from './steps/story-add-background-2.es.gif';
-import stepStorySwitchBackdrop from './steps/story-switch-backdrop.es.gif';
-import stepStoryHide from './steps/story-hide-character.es.gif';
-import stepStoryShow from './steps/story-show-character.es.gif';
+import storyPickBackdrop from './steps/story-pick-backdrop.es.gif';
+import storyPickSprite from './steps/story-pick-sprite.es.gif';
+import storySaySomething from './steps/story-say-something.es.gif';
+import storyPickSprite2 from './steps/story-pick-sprite2.es.gif';
+import storyFlip from './steps/story-flip.es.gif';
+import storyConversation from './steps/story-conversation.es.gif';
+import storyPickBackdrop2 from './steps/story-pick-backdrop2.es.gif';
+import storySwitchBackdrop from './steps/story-switch-backdrop.es.gif';
+import storyHideCharacter from './steps/story-hide-character.es.gif';
+import storyShowCharacter from './steps/story-show-character.es.gif';
 
 // Video Sensing
-import stepVideoSensAddExtension from './steps/videosens-add-extension.es.gif';
-import stepVideoSensPet from './steps/videosens-pet-cat.es.gif';
-import stepVideoSensAnimate from './steps/videosens-animate.es.gif';
-import stepVideoSensPop from './steps/videosens-pop.es.gif';
+import videoAddExtension from './steps/video-add-extension.es.gif';
+import videoPet from './steps/video-pet.es.gif';
+import videoAnimate from './steps/video-animate.es.gif';
+import videoPop from './steps/video-pop.es.gif';
 
-export default {
+const esImages = {
     // Intro
-    stepMove: stepMove,
-    stepMoveSayHello: stepMoveSayHello,
+    introMove: introMove,
+    introSayHello: introSayHello,
 
     // // Text to Speech
-    // stepAddSpeechExtension: stepAddSpeechExtension,
-    // stepSpeechSpeak: stepSpeechSpeak,
-    // stepSpeechSetVoice: stepSpeechSetVoice,
-    // stepSpeechMove: stepSpeechMove,
-    // stepSpeechBackdrop: stepSpeechBackdrop,
-    // stepSpeechAddSprite: stepSpeechAddSprite,
-    // stepSpeechSong: stepSpeechSong,
-    // stepSpeechColor: stepSpeechColor,
-    // stepSpeechSpin: stepSpeechSpin,
-    // stepSpeechGrow: stepSpeechGrow,
+    // speechAddExtension: speechAddExtension,
+    // speechSaySomething: speechSaySomething,
+    // speechSetVoice: speechSetVoice,
+    // speechMoveAround: speechMoveAround,
+    // speechAddBackdrop: speechAddBackdrop,
+    // speechAddSprite: speechAddSprite,
+    // speechSong: speechSong,
+    // speechChangeColor: speechChangeColor,
+    // speechSpin: speechSpin,
+    // speechGrowShrink: speechGrowShrink,
     //
     // // Cartoon Network
-    // stepCNcharacter: stepCNcharacter,
-    // stepCNsay: stepCNsay,
-    // stepCNglide: stepCNglide,
-    // stepCNpicksprite: stepCNpicksprite,
-    // stepCNcollect: stepCNcollect,
-    // stepCNvariable: stepCNvariable,
-    // stepCNscore: stepCNscore,
-    // stepCNbackdrop: stepCNbackdrop,
+    // cnShowCharacter: cnShowCharacter,
+    // cnSay: cnSay,
+    // cnGlide: cnGlide,
+    // cnPickSprite: cnPickSprite,
+    // cnCollect: cnCollect,
+    // cnVariable: cnVariable,
+    // cnScore: cnScore,
+    // cnBackdrop: cnBackdrop,
 
     // Add sprite
-    stepAddSprite: stepAddSprite,
+    addSprite: addSprite,
 
     // Animate a name
-    stepAnimatePickLetter: stepAnimatePickLetter,
-    stepAnimatePlaySound: stepAnimatePlaySound,
-    stepAnimatePickLetter2: stepAnimatePickLetter2,
-    stepAnimateChangeColor: stepAnimateChangeColor,
-    stepAnimateSpin: stepAnimateSpin,
-    stepAnimateGrow: stepAnimateGrow,
-
+    namePickLetter: namePickLetter,
+    namePlaySound: namePlaySound,
+    namePickLetter2: namePickLetter2,
+    nameChangeColor: nameChangeColor,
+    nameSpin: nameSpin,
+    nameGrow: nameGrow,
 
     // Make-Music
-    stepPickInstrument: stepPickInstrument,
-    stepPlaySoundClick: stepPlaySoundClick,
-    stepMakeSong: stepMakeSong,
-    stepMakeBeat: stepMakeBeat,
-    stepMakeBeatbox: stepMakeBeatbox,
+    musicPickInstrument: musicPickInstrument,
+    musicPlaySound: musicPlaySound,
+    musicMakeSong: musicMakeSong,
+    musicMakeBeat: musicMakeBeat,
+    musicMakeBeatbox: musicMakeBeatbox,
 
     // Chase-Game
-    stepBG: stepBG,
-    stepAddOcto: stepAddOcto,
-    stepLeftRight: stepLeftRight,
-    stepUpDown: stepUpDown,
-    stepAddStar: stepAddStar,
-    stepMoveRandom: stepMoveRandom,
-    stepWhenTouch: stepWhenTouch,
-    stepScoreVariable: stepScoreVariable,
-    stepScoreWhenTouch: stepScoreWhenTouch,
+    chaseGameAddBackdrop: chaseGameAddBackdrop,
+    chaseGameAddSprite1: chaseGameAddSprite1,
+    chaseGameRightLeft: chaseGameRightLeft,
+    chaseGameUpDown: chaseGameUpDown,
+    chaseGameAddSprite2: chaseGameAddSprite2,
+    chaseGameMoveRandomly: chaseGameMoveRandomly,
+    chaseGamePlaySound: chaseGamePlaySound,
+    chaseGameAddVariable: chaseGameAddVariable,
+    chaseGameChangeScore: chaseGameChangeScore,
 
-    // Make-A-Game
-    stepGamePickSprite: stepGamePickSprite,
-    stepGamePlaySound: stepGamePlaySound,
-    stepGameAddScore: stepGameAddScore,
-    stepGameChangeScore: stepGameChangeScore,
-    stepRandom: stepRandom,
-    stepGameChangeColor: stepGameChangeColor,
-    stepResetScore: stepResetScore,
+    // Make-A-Pop/Clicker Game
+    popGamePickSprite: popGamePickSprite,
+    popGamePlaySound: popGamePlaySound,
+    popGameAddScore: popGameAddScore,
+    popGameChangeScore: popGameChangeScore,
+    popGameRandomPosition: popGameRandomPosition,
+    popGameChangeColor: popGameChangeColor,
+    popGameResetScore: popGameResetScore,
 
     // Animate A Character
-    stepAnimateCharPickBackdrop: stepAnimateCharPickBackdrop,
-    stepAnimateCharPickSprite: stepAnimateCharPickSprite,
-    stepAnimateCharSaySomething: stepAnimateCharSaySomething,
-    stepAnimateCharAddSound: stepAnimateCharAddSound,
-    stepAnimateCharTalk: stepAnimateCharTalk,
-    stepAnimateCharMove: stepAnimateCharMove,
-    stepAnimateCharJump: stepAnimateCharJump,
-    stepAnimateCharChangeColor: stepAnimateCharChangeColor,
+    animateCharPickBackdrop: animateCharPickBackdrop,
+    animateCharPickSprite: animateCharPickSprite,
+    animateCharSaySomething: animateCharSaySomething,
+    animateCharAddSound: animateCharAddSound,
+    animateCharTalk: animateCharTalk,
+    animateCharMove: animateCharMove,
+    animateCharJump: animateCharJump,
+    animateCharChangeColor: animateCharChangeColor,
 
     // Tell A Story
-    stepStoryPickBackdrop: stepStoryPickBackdrop,
-    stepStoryPickSprite: stepStoryPickSprite,
-    stepStoryCharSaySomething: stepStoryCharSaySomething,
-    stepStoryCharAddAnotherSprite: stepStoryCharAddAnotherSprite,
-    stepStoryFlip: stepStoryFlip,
-    stepStoryConversation: stepStoryConversation,
-    stepStoryAddAnotherBackdrop: stepStoryAddAnotherBackdrop,
-    stepStorySwitchBackdrop: stepStorySwitchBackdrop,
-    stepStoryHide: stepStoryHide,
-    stepStoryShow: stepStoryShow,
+    storyPickBackdrop: storyPickBackdrop,
+    storyPickSprite: storyPickSprite,
+    storySaySomething: storySaySomething,
+    storyPickSprite2: storyPickSprite2,
+    storyFlip: storyFlip,
+    storyConversation: storyConversation,
+    storyPickBackdrop2: storyPickBackdrop2,
+    storySwitchBackdrop: storySwitchBackdrop,
+    storyHideCharacter: storyHideCharacter,
+    storyShowCharacter: storyShowCharacter,
 
     // Video Sensing
-    stepVideoSensAddExtension: stepVideoSensAddExtension,
-    stepVideoSensPet: stepVideoSensPet,
-    stepVideoSensAnimate: stepVideoSensAnimate,
-    stepVideoSensPop: stepVideoSensPop
+    videoAddExtension: videoAddExtension,
+    videoPet: videoPet,
+    videoAnimate: videoAnimate,
+    videoPop: videoPop
 
 };
+
+export {esImages};
diff --git a/src/lib/libraries/decks/index.jsx b/src/lib/libraries/decks/index.jsx
index 12de2bf44..92dcb643d 100644
--- a/src/lib/libraries/decks/index.jsx
+++ b/src/lib/libraries/decks/index.jsx
@@ -69,7 +69,7 @@ export default {
                     id="gui.howtos.intro-move.step_stepMove"
                 />
             ),
-            image: 'stepMove'
+            image: 'introMove'
         }, {
             title: (
                 <FormattedMessage
@@ -78,7 +78,7 @@ export default {
                     id="gui.howtos.add-a-move-block.step_stepMoveSayHello"
                 />
             ),
-            image: 'stepMoveSayHello'
+            image: 'introSayHello'
         }, {
             deckIds: [
                 'add-a-backdrop',
@@ -111,7 +111,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_AddTXTextension"
                 />
             ),
-            image: 'stepAddSpeechExtension'
+            image: 'speechAddExtension'
         }, {
             title: (
                 <FormattedMessage
@@ -120,7 +120,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_TXTSpeech"
                 />
             ),
-            image: 'stepSpeechSpeak'
+            image: 'speechSaySomething'
         }, {
             title: (
                 <FormattedMessage
@@ -129,7 +129,7 @@ export default {
                     id="gui.howtos.say-it-out-loud_TXTSetVoice"
                 />
             ),
-            image: 'stepSpeechSetVoice'
+            image: 'speechSetVoice'
         }, {
             title: (
                 <FormattedMessage
@@ -138,7 +138,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_TXTMove"
                 />
             ),
-            image: 'stepSpeechMove'
+            image: 'speechMoveAround'
         }, {
             title: (
                 <FormattedMessage
@@ -147,7 +147,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_TXTBackdrop"
                 />
             ),
-            image: 'stepSpeechBackdrop'
+            image: 'speechAddBackdrop'
         }, {
             title: (
                 <FormattedMessage
@@ -156,7 +156,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_TXTAddSprite"
                 />
             ),
-            image: 'stepSpeechAddSprite'
+            image: 'speechAddSprite'
         }, {
             title: (
                 <FormattedMessage
@@ -165,7 +165,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_TXTSong"
                 />
             ),
-            image: 'stepSpeechSong'
+            image: 'speechSong'
         }, {
             title: (
                 <FormattedMessage
@@ -174,7 +174,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_TXTColor"
                 />
             ),
-            image: 'stepSpeechColor'
+            image: 'speechChangeColor'
         }, {
             title: (
                 <FormattedMessage
@@ -183,7 +183,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_TXTSpin"
                 />
             ),
-            image: 'stepSpeechSpin'
+            image: 'speechSpin'
         }, {
             title: (
                 <FormattedMessage
@@ -192,7 +192,7 @@ export default {
                     id="gui.howtos.say-it-out-loud.step_TXTGrow"
                 />
             ),
-            image: 'stepSpeechGrow'
+            image: 'speechGrowShrink'
         }, {
             deckIds: [
                 'animate-a-name',
@@ -226,7 +226,7 @@ export default {
                     id="gui.howtos.cartoon-network.step_CNcharacter"
                 />
             ),
-            image: 'stepCNcharacter'
+            image: 'cnShowCharacter'
         }, {
             title: (
                 <FormattedMessage
@@ -235,7 +235,7 @@ export default {
                     id="gui.howtos.cartoon-network.step_CNsay"
                 />
             ),
-            image: 'stepCNsay'
+            image: 'cnSay'
         }, {
             title: (
                 <FormattedMessage
@@ -244,7 +244,7 @@ export default {
                     id="gui.howtos.cartoon-network.step_CNglide"
                 />
             ),
-            image: 'stepCNglide'
+            image: 'cnGlide'
         }, {
             title: (
                 <FormattedMessage
@@ -253,7 +253,7 @@ export default {
                     id="gui.howtos.cartoon-network.step_CNpicksprite"
                 />
             ),
-            image: 'stepCNpicksprite'
+            image: 'cnPickSprite'
         }, {
             title: (
                 <FormattedMessage
@@ -262,7 +262,7 @@ export default {
                     id="gui.howtos.cartoon-network.step_CNcollect"
                 />
             ),
-            image: 'stepCNcollect'
+            image: 'cnCollect'
         }, {
             title: (
                 <FormattedMessage
@@ -271,7 +271,7 @@ export default {
                     id="gui.howtos.cartoon-network.step_CNvariable"
                 />
             ),
-            image: 'stepCNvariable'
+            image: 'cnVariable'
         }, {
             title: (
                 <FormattedMessage
@@ -280,7 +280,7 @@ export default {
                     id="gui.howtos.cartoon-network.step_CNscore"
                 />
             ),
-            image: 'stepCNscore'
+            image: 'cnScore'
         }, {
             title: (
                 <FormattedMessage
@@ -289,7 +289,7 @@ export default {
                     id="gui.howtos.cartoon-network.step_CNbackdrop"
                 />
             ),
-            image: 'stepCNbackdrop'
+            image: 'cnBackdrop'
         },
         {
             video: '6o76f5ivo1'
@@ -323,7 +323,7 @@ export default {
                     id="gui.howtos.animate-a-name.step_AnimatePickLetter"
                 />
             ),
-            image: 'stepAnimatePickLetter'
+            image: 'namePickLetter'
         }, {
             title: (
                 <FormattedMessage
@@ -332,7 +332,7 @@ export default {
                     id="gui.howtos.animate-a-name.step_AnimatePlaySound"
                 />
             ),
-            image: 'stepAnimatePlaySound'
+            image: 'namePlaySound'
         }, {
             title: (
                 <FormattedMessage
@@ -341,7 +341,7 @@ export default {
                     id="gui.howtos.animate-a-name.step_AnimatePickLetter2"
                 />
             ),
-            image: 'stepAnimatePickLetter2'
+            image: 'namePickLetter2'
         }, {
             title: (
                 <FormattedMessage
@@ -350,7 +350,7 @@ export default {
                     id="gui.howtos.animate-a-name.step_AnimateChangeColor"
                 />
             ),
-            image: 'stepAnimateChangeColor'
+            image: 'nameChangeColor'
         }, {
             title: (
                 <FormattedMessage
@@ -359,7 +359,7 @@ export default {
                     id="gui.howtos.animate-a-name.step_AnimateSpin"
                 />
             ),
-            image: 'stepAnimateSpin'
+            image: 'nameSpin'
         }, {
             title: (
                 <FormattedMessage
@@ -368,7 +368,7 @@ export default {
                     id="gui.howtos.animate-a-name.step_AnimateGrow"
                 />
             ),
-            image: 'stepAnimateGrow'
+            image: 'nameGrow'
         }, {
             deckIds: [
                 'add-a-backdrop',
@@ -399,7 +399,7 @@ export default {
                     id="gui.howtos.Make-Music.step_PickInstrument"
                 />
             ),
-            image: 'stepPickInstrument'
+            image: 'musicPickInstrument'
         },
         {
             title: (
@@ -409,7 +409,7 @@ export default {
                     id="gui.howtos.Make-Music.step_PlaySoundClick"
                 />
             ),
-            image: 'stepPlaySoundClick'
+            image: 'musicPlaySound'
         },
         {
             title: (
@@ -419,7 +419,7 @@ export default {
                     id="gui.howtos.Make-Music.step_MakeSong"
                 />
             ),
-            image: 'stepMakeSong'
+            image: 'musicMakeSong'
         }, {
             title: (
                 <FormattedMessage
@@ -428,7 +428,7 @@ export default {
                     id="gui.howtos.make-music.step_MakeBeat"
                 />
             ),
-            image: 'stepMakeBeat'
+            image: 'musicMakeBeat'
         }, {
             title: (
                 <FormattedMessage
@@ -437,7 +437,7 @@ export default {
                     id="gui.howtos.make-music.step_MakeBeatBox"
                 />
             ),
-            image: 'stepMakeBeatbox'
+            image: 'musicMakeBeatbox'
         }, {
             deckIds: [
                 'add-a-backdrop',
@@ -468,7 +468,7 @@ export default {
                     id="gui.howtos.Make-A-Game.step_GamePickSprite"
                 />
             ),
-            image: 'stepGamePickSprite'
+            image: 'popGamePickSprite'
         }, {
             title: (
                 <FormattedMessage
@@ -477,7 +477,7 @@ export default {
                     id="gui.howtos.make-a-game.step_GamePlaySound"
                 />
             ),
-            image: 'stepGamePlaySound'
+            image: 'popGamePlaySound'
         }, {
             title: (
                 <FormattedMessage
@@ -486,7 +486,7 @@ export default {
                     id="gui.howtos.make-a-game.step_GameAddScore"
                 />
             ),
-            image: 'stepGameAddScore'
+            image: 'popGameAddScore'
         }, {
             title: (
                 <FormattedMessage
@@ -496,7 +496,7 @@ export default {
                 />
             ),
 
-            image: 'stepGameChangeScore'
+            image: 'popGameChangeScore'
         }, {
             title: (
                 <FormattedMessage
@@ -505,7 +505,7 @@ export default {
                     id="gui.howtos.make-a-game.step_Random"
                 />
             ),
-            image: 'stepRandom'
+            image: 'popGameRandomPosition'
         }, {
             title: (
                 <FormattedMessage
@@ -514,7 +514,7 @@ export default {
                     id="gui.howtos.make-music.step_GameChangeColor"
                 />
             ),
-            image: 'stepGameChangeColor'
+            image: 'popGameChangeColor'
         }, {
             title: (
                 <FormattedMessage
@@ -523,7 +523,7 @@ export default {
                     id="gui.howtos.make-music.step_ResetScore"
                 />
             ),
-            image: 'stepResetScore'
+            image: 'popGameResetScore'
         }, {
             deckIds: [
                 'add-a-backdrop',
@@ -555,7 +555,7 @@ export default {
                     id="gui.howtos.Chase-Game.step_BG"
                 />
             ),
-            image: 'stepBG'
+            image: 'chaseGameAddBackdrop'
         }, {
             title: (
                 <FormattedMessage
@@ -564,7 +564,7 @@ export default {
                     id="gui.howtos.chase-game.step_AddOcto"
                 />
             ),
-            image: 'stepAddOcto'
+            image: 'chaseGameAddSprite1'
         }, {
             title: (
                 <FormattedMessage
@@ -573,7 +573,7 @@ export default {
                     id="gui.howtos.make-music.step_LeftRight"
                 />
             ),
-            image: 'stepLeftRight'
+            image: 'chaseGameRightLeft'
         }, {
             title: (
                 <FormattedMessage
@@ -582,7 +582,7 @@ export default {
                     id="gui.howtos.Chase-Game.step_UpDown"
                 />
             ),
-            image: 'stepUpDown'
+            image: 'chaseGameUpDown'
         }, {
             title: (
                 <FormattedMessage
@@ -591,7 +591,7 @@ export default {
                     id="gui.howtos.Chase-Game.step_AddStar"
                 />
             ),
-            image: 'stepAddStar'
+            image: 'chaseGameAddSprite2'
         }, {
             title: (
                 <FormattedMessage
@@ -600,7 +600,7 @@ export default {
                     id="gui.howtos.Chase-Game.step_MoveRandom"
                 />
             ),
-            image: 'stepMoveRandom'
+            image: 'chaseGameMoveRandomly'
         }, {
             title: (
                 <FormattedMessage
@@ -609,7 +609,7 @@ export default {
                     id="gui.howtos.Chase-Game.step_WhenTouch"
                 />
             ),
-            image: 'stepWhenTouch'
+            image: 'chaseGamePlaySound'
         }, {
             title: (
                 <FormattedMessage
@@ -618,7 +618,7 @@ export default {
                     id="gui.howtos.Chase-Game.step_ScoreVariable"
                 />
             ),
-            image: 'stepScoreVariable'
+            image: 'chaseGameAddVariable'
         }, {
             title: (
                 <FormattedMessage
@@ -627,7 +627,7 @@ export default {
                     id="gui.howtos.Chase-Game.ScoreWhenTouch"
                 />
             ),
-            image: 'stepScoreWhenTouch'
+            image: 'chaseGameChangeScore'
         }, {
             deckIds: [
                 'add-effects',
@@ -657,7 +657,7 @@ export default {
                     id="gui.howtos.animate-char.step_addbg"
                 />
             ),
-            image: 'stepAnimateCharPickBackdrop'
+            image: 'animateCharPickBackdrop'
         }, {
             title: (
                 <FormattedMessage
@@ -666,7 +666,7 @@ export default {
                     id="gui.howtos.animate-char.step_addsprite"
                 />
             ),
-            image: 'stepAnimateCharPickSprite'
+            image: 'animateCharPickSprite'
         }, {
             title: (
                 <FormattedMessage
@@ -675,7 +675,7 @@ export default {
                     id="gui.howtos.animate-char.step_saysomething"
                 />
             ),
-            image: 'stepAnimateCharSaySomething'
+            image: 'animateCharSaySomething'
         }, {
             title: (
                 <FormattedMessage
@@ -684,7 +684,7 @@ export default {
                     id="gui.howtos.animate-char.step_addsound"
                 />
             ),
-            image: 'stepAnimateCharAddSound'
+            image: 'animateCharAddSound'
         }, {
             title: (
                 <FormattedMessage
@@ -693,7 +693,7 @@ export default {
                     id="gui.howtos.animate-char.step_animatetalking"
                 />
             ),
-            image: 'stepAnimateCharTalk'
+            image: 'animateCharTalk'
         }, {
             title: (
                 <FormattedMessage
@@ -702,7 +702,7 @@ export default {
                     id="gui.howtos.animate-char.step_arrowkeys"
                 />
             ),
-            image: 'stepAnimateCharMove'
+            image: 'animateCharMove'
         }, {
             title: (
                 <FormattedMessage
@@ -711,7 +711,7 @@ export default {
                     id="gui.howtos.animate-char.step_jump"
                 />
             ),
-            image: 'stepAnimateCharJump'
+            image: 'animateCharJump'
         }, {
             title: (
                 <FormattedMessage
@@ -720,7 +720,7 @@ export default {
                     id="gui.howtos.animate-char.step_changecolor"
                 />
             ),
-            image: 'stepAnimateCharChangeColor'
+            image: 'animateCharChangeColor'
         }, {
             deckIds: [
                 'Chase-Game',
@@ -750,7 +750,7 @@ export default {
                     id="gui.howtos.story.step_addbg"
                 />
             ),
-            image: 'stepStoryPickBackdrop'
+            image: 'storyPickBackdrop'
         }, {
             title: (
                 <FormattedMessage
@@ -759,7 +759,7 @@ export default {
                     id="gui.howtos.story.step_addsprite"
                 />
             ),
-            image: 'stepStoryPickSprite'
+            image: 'storyPickSprite'
         }, {
             title: (
                 <FormattedMessage
@@ -768,7 +768,7 @@ export default {
                     id="gui.howtos.story.step_saysomething"
                 />
             ),
-            image: 'stepStoryCharSaySomething'
+            image: 'storySaySomething'
         }, {
             title: (
                 <FormattedMessage
@@ -777,7 +777,7 @@ export default {
                     id="gui.howtos.story.step_addanothersprite"
                 />
             ),
-            image: 'stepStoryCharAddAnotherSprite'
+            image: 'storyPickSprite2'
         }, {
             title: (
                 <FormattedMessage
@@ -786,7 +786,7 @@ export default {
                     id="gui.howtos.story.step_flip"
                 />
             ),
-            image: 'stepStoryFlip'
+            image: 'storyFlip'
         }, {
             title: (
                 <FormattedMessage
@@ -795,7 +795,7 @@ export default {
                     id="gui.howtos.story.step_conversation"
                 />
             ),
-            image: 'stepStoryConversation'
+            image: 'storyConversation'
         }, {
             title: (
                 <FormattedMessage
@@ -804,7 +804,7 @@ export default {
                     id="gui.howtos.story.addanotherbg"
                 />
             ),
-            image: 'stepStoryAddAnotherBackdrop'
+            image: 'storyPickBackdrop2'
         }, {
             title: (
                 <FormattedMessage
@@ -813,7 +813,7 @@ export default {
                     id="gui.howtos.story.step_swithbg"
                 />
             ),
-            image: 'stepStorySwitchBackdrop'
+            image: 'storySwitchBackdrop'
         }, {
             title: (
                 <FormattedMessage
@@ -822,7 +822,7 @@ export default {
                     id="gui.howtos.story.step_hidewizard"
                 />
             ),
-            image: 'stepStoryHide'
+            image: 'storyHideCharacter'
         }, {
             title: (
                 <FormattedMessage
@@ -831,7 +831,7 @@ export default {
                     id="gui.howtos.story.step_showwizard"
                 />
             ),
-            image: 'stepStoryShow'
+            image: 'storyShowCharacter'
         },
         {
             deckIds: [
@@ -862,7 +862,7 @@ export default {
                     id="gui.howtos.videosens.step_addextension"
                 />
             ),
-            image: 'stepVideoSensAddExtension'
+            image: 'videoAddExtension'
         }, {
             title: (
                 <FormattedMessage
@@ -871,7 +871,7 @@ export default {
                     id="gui.howtos.videosens.step_pet"
                 />
             ),
-            image: 'stepVideoSensPet'
+            image: 'videoPet'
         }, {
             title: (
                 <FormattedMessage
@@ -880,7 +880,7 @@ export default {
                     id="gui.howtos.videosens.step_animate"
                 />
             ),
-            image: 'stepVideoSensAnimate'
+            image: 'videoAnimate'
         }, {
             title: (
                 <FormattedMessage
@@ -889,7 +889,7 @@ export default {
                     id="gui.howtos.videosens.step_pop"
                 />
             ),
-            image: 'stepVideoSensPop'
+            image: 'videoPop'
         }, {
             deckIds: [
                 'Make-Music',
@@ -918,7 +918,7 @@ export default {
                         id="gui.howtos.add-sprite.step_addSprite"
                     />
                 ),
-                image: 'stepAddSprite'
+                image: 'addSprite'
             },
             {
                 deckIds: [
diff --git a/src/lib/libraries/decks/steps/animate-char-pick-another-sprite.en.gif b/src/lib/libraries/decks/steps/animate-char-pick-another-sprite.en.gif
deleted file mode 100644
index 97bed56b4..000000000
Binary files a/src/lib/libraries/decks/steps/animate-char-pick-another-sprite.en.gif and /dev/null differ
diff --git a/src/lib/libraries/decks/steps/animate-char-pick-another-sprite.es.gif b/src/lib/libraries/decks/steps/animate-char-pick-another-sprite.es.gif
deleted file mode 100755
index 9e943e001..000000000
Binary files a/src/lib/libraries/decks/steps/animate-char-pick-another-sprite.es.gif and /dev/null differ
diff --git a/src/lib/libraries/decks/steps/chase-game-touching.en.gif b/src/lib/libraries/decks/steps/chase-game-play-sound.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/chase-game-touching.en.gif
rename to src/lib/libraries/decks/steps/chase-game-play-sound.en.gif
diff --git a/src/lib/libraries/decks/steps/chase-game-touching.es.gif b/src/lib/libraries/decks/steps/chase-game-play-sound.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/chase-game-touching.es.gif
rename to src/lib/libraries/decks/steps/chase-game-play-sound.es.gif
diff --git a/src/lib/libraries/decks/steps/chase-game-move-rightleft.en.gif b/src/lib/libraries/decks/steps/chase-game-right-left.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/chase-game-move-rightleft.en.gif
rename to src/lib/libraries/decks/steps/chase-game-right-left.en.gif
diff --git a/src/lib/libraries/decks/steps/chase-game-move-rightleft.es.gif b/src/lib/libraries/decks/steps/chase-game-right-left.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/chase-game-move-rightleft.es.gif
rename to src/lib/libraries/decks/steps/chase-game-right-left.es.gif
diff --git a/src/lib/libraries/decks/steps/chase-game-move-updown.en.gif b/src/lib/libraries/decks/steps/chase-game-up-down.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/chase-game-move-updown.en.gif
rename to src/lib/libraries/decks/steps/chase-game-up-down.en.gif
diff --git a/src/lib/libraries/decks/steps/chase-game-move-updown.es.gif b/src/lib/libraries/decks/steps/chase-game-up-down.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/chase-game-move-updown.es.gif
rename to src/lib/libraries/decks/steps/chase-game-up-down.es.gif
diff --git a/src/lib/libraries/decks/steps/cn-8-change-backdrop.en.gif b/src/lib/libraries/decks/steps/cn-backdrop.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/cn-8-change-backdrop.en.gif
rename to src/lib/libraries/decks/steps/cn-backdrop.en.gif
diff --git a/src/lib/libraries/decks/steps/cn-5-collect.en.gif b/src/lib/libraries/decks/steps/cn-collect.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/cn-5-collect.en.gif
rename to src/lib/libraries/decks/steps/cn-collect.en.gif
diff --git a/src/lib/libraries/decks/steps/cn-3-glide.en.gif b/src/lib/libraries/decks/steps/cn-glide.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/cn-3-glide.en.gif
rename to src/lib/libraries/decks/steps/cn-glide.en.gif
diff --git a/src/lib/libraries/decks/steps/cn-4-pick-gem.en.gif b/src/lib/libraries/decks/steps/cn-pick-sprite.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/cn-4-pick-gem.en.gif
rename to src/lib/libraries/decks/steps/cn-pick-sprite.en.gif
diff --git a/src/lib/libraries/decks/steps/cn-2-say.en.gif b/src/lib/libraries/decks/steps/cn-say.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/cn-2-say.en.gif
rename to src/lib/libraries/decks/steps/cn-say.en.gif
diff --git a/src/lib/libraries/decks/steps/cn-7-score.en.gif b/src/lib/libraries/decks/steps/cn-score.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/cn-7-score.en.gif
rename to src/lib/libraries/decks/steps/cn-score.en.gif
diff --git a/src/lib/libraries/decks/steps/cn-1-hideshow.en.gif b/src/lib/libraries/decks/steps/cn-show-character.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/cn-1-hideshow.en.gif
rename to src/lib/libraries/decks/steps/cn-show-character.en.gif
diff --git a/src/lib/libraries/decks/steps/cn-6-variable.en.gif b/src/lib/libraries/decks/steps/cn-variable.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/cn-6-variable.en.gif
rename to src/lib/libraries/decks/steps/cn-variable.en.gif
diff --git a/src/lib/libraries/decks/steps/getting-started1.en.gif b/src/lib/libraries/decks/steps/intro-move.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/getting-started1.en.gif
rename to src/lib/libraries/decks/steps/intro-move.en.gif
diff --git a/src/lib/libraries/decks/steps/getting-started1.es.gif b/src/lib/libraries/decks/steps/intro-move.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/getting-started1.es.gif
rename to src/lib/libraries/decks/steps/intro-move.es.gif
diff --git a/src/lib/libraries/decks/steps/getting-started2.en.gif b/src/lib/libraries/decks/steps/intro-say-hello.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/getting-started2.en.gif
rename to src/lib/libraries/decks/steps/intro-say-hello.en.gif
diff --git a/src/lib/libraries/decks/steps/getting-started2.es.gif b/src/lib/libraries/decks/steps/intro-say-hello.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/getting-started2.es.gif
rename to src/lib/libraries/decks/steps/intro-say-hello.es.gif
diff --git a/src/lib/libraries/decks/steps/make-music-make-beat.en.gif b/src/lib/libraries/decks/steps/music-make-beat.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-make-beat.en.gif
rename to src/lib/libraries/decks/steps/music-make-beat.en.gif
diff --git a/src/lib/libraries/decks/steps/make-music-make-beat.es.gif b/src/lib/libraries/decks/steps/music-make-beat.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-make-beat.es.gif
rename to src/lib/libraries/decks/steps/music-make-beat.es.gif
diff --git a/src/lib/libraries/decks/steps/make-music-beatbox.en.gif b/src/lib/libraries/decks/steps/music-make-beatbox.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-beatbox.en.gif
rename to src/lib/libraries/decks/steps/music-make-beatbox.en.gif
diff --git a/src/lib/libraries/decks/steps/make-music-beatbox.es.gif b/src/lib/libraries/decks/steps/music-make-beatbox.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-beatbox.es.gif
rename to src/lib/libraries/decks/steps/music-make-beatbox.es.gif
diff --git a/src/lib/libraries/decks/steps/make-music-make-song.en.gif b/src/lib/libraries/decks/steps/music-make-song.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-make-song.en.gif
rename to src/lib/libraries/decks/steps/music-make-song.en.gif
diff --git a/src/lib/libraries/decks/steps/make-music-make-song.es.gif b/src/lib/libraries/decks/steps/music-make-song.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-make-song.es.gif
rename to src/lib/libraries/decks/steps/music-make-song.es.gif
diff --git a/src/lib/libraries/decks/steps/make-music-pick-instrument.en.gif b/src/lib/libraries/decks/steps/music-pick-instrument.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-pick-instrument.en.gif
rename to src/lib/libraries/decks/steps/music-pick-instrument.en.gif
diff --git a/src/lib/libraries/decks/steps/make-music-pick-instrument.es.gif b/src/lib/libraries/decks/steps/music-pick-instrument.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-pick-instrument.es.gif
rename to src/lib/libraries/decks/steps/music-pick-instrument.es.gif
diff --git a/src/lib/libraries/decks/steps/make-music-play-sound.en.gif b/src/lib/libraries/decks/steps/music-play-sound.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-play-sound.en.gif
rename to src/lib/libraries/decks/steps/music-play-sound.en.gif
diff --git a/src/lib/libraries/decks/steps/make-music-play-sound.es.gif b/src/lib/libraries/decks/steps/music-play-sound.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/make-music-play-sound.es.gif
rename to src/lib/libraries/decks/steps/music-play-sound.es.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-change-color.en.gif b/src/lib/libraries/decks/steps/name-change-color.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-change-color.en.gif
rename to src/lib/libraries/decks/steps/name-change-color.en.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-change-color.es.gif b/src/lib/libraries/decks/steps/name-change-color.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-change-color.es.gif
rename to src/lib/libraries/decks/steps/name-change-color.es.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-grow.en.gif b/src/lib/libraries/decks/steps/name-grow.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-grow.en.gif
rename to src/lib/libraries/decks/steps/name-grow.en.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-grow.es.gif b/src/lib/libraries/decks/steps/name-grow.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-grow.es.gif
rename to src/lib/libraries/decks/steps/name-grow.es.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-pick-a-letter.en.gif b/src/lib/libraries/decks/steps/name-pick-letter.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-pick-a-letter.en.gif
rename to src/lib/libraries/decks/steps/name-pick-letter.en.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-pick-a-letter.es.gif b/src/lib/libraries/decks/steps/name-pick-letter.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-pick-a-letter.es.gif
rename to src/lib/libraries/decks/steps/name-pick-letter.es.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-pick-a-letter2.en.gif b/src/lib/libraries/decks/steps/name-pick-letter2.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-pick-a-letter2.en.gif
rename to src/lib/libraries/decks/steps/name-pick-letter2.en.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-pick-a-letter2.es.gif b/src/lib/libraries/decks/steps/name-pick-letter2.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-pick-a-letter2.es.gif
rename to src/lib/libraries/decks/steps/name-pick-letter2.es.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-play-sound.en.gif b/src/lib/libraries/decks/steps/name-play-sound.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-play-sound.en.gif
rename to src/lib/libraries/decks/steps/name-play-sound.en.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-play-sound.es.gif b/src/lib/libraries/decks/steps/name-play-sound.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-play-sound.es.gif
rename to src/lib/libraries/decks/steps/name-play-sound.es.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-spin.en.gif b/src/lib/libraries/decks/steps/name-spin.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-spin.en.gif
rename to src/lib/libraries/decks/steps/name-spin.en.gif
diff --git a/src/lib/libraries/decks/steps/animate-name-spin.es.gif b/src/lib/libraries/decks/steps/name-spin.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/animate-name-spin.es.gif
rename to src/lib/libraries/decks/steps/name-spin.es.gif
diff --git a/src/lib/libraries/decks/steps/speech-05-add-backdrop.en.gif b/src/lib/libraries/decks/steps/speech-add-backdrop.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-05-add-backdrop.en.gif
rename to src/lib/libraries/decks/steps/speech-add-backdrop.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-01-add-extensions.en.gif b/src/lib/libraries/decks/steps/speech-add-extension.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-01-add-extensions.en.gif
rename to src/lib/libraries/decks/steps/speech-add-extension.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-06-add-character.en.gif b/src/lib/libraries/decks/steps/speech-add-sprite.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-06-add-character.en.gif
rename to src/lib/libraries/decks/steps/speech-add-sprite.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-08-color-click.en.gif b/src/lib/libraries/decks/steps/speech-change-color.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-08-color-click.en.gif
rename to src/lib/libraries/decks/steps/speech-change-color.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-10-grow-shrink.en.gif b/src/lib/libraries/decks/steps/speech-grow-shrink.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-10-grow-shrink.en.gif
rename to src/lib/libraries/decks/steps/speech-grow-shrink.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-04-move-around.en.gif b/src/lib/libraries/decks/steps/speech-move-around.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-04-move-around.en.gif
rename to src/lib/libraries/decks/steps/speech-move-around.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-02-say-something.en.gif b/src/lib/libraries/decks/steps/speech-say-something.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-02-say-something.en.gif
rename to src/lib/libraries/decks/steps/speech-say-something.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-03-set-voice.en.gif b/src/lib/libraries/decks/steps/speech-set-voice.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-03-set-voice.en.gif
rename to src/lib/libraries/decks/steps/speech-set-voice.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-07-perform-song.en.gif b/src/lib/libraries/decks/steps/speech-song.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-07-perform-song.en.gif
rename to src/lib/libraries/decks/steps/speech-song.en.gif
diff --git a/src/lib/libraries/decks/steps/speech-09-spin.en.gif b/src/lib/libraries/decks/steps/speech-spin.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/speech-09-spin.en.gif
rename to src/lib/libraries/decks/steps/speech-spin.en.gif
diff --git a/src/lib/libraries/decks/steps/story-add-background-2.en.gif b/src/lib/libraries/decks/steps/story-pick-backdrop2.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/story-add-background-2.en.gif
rename to src/lib/libraries/decks/steps/story-pick-backdrop2.en.gif
diff --git a/src/lib/libraries/decks/steps/story-add-background-2.es.gif b/src/lib/libraries/decks/steps/story-pick-backdrop2.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/story-add-background-2.es.gif
rename to src/lib/libraries/decks/steps/story-pick-backdrop2.es.gif
diff --git a/src/lib/libraries/decks/steps/story-pick-another-sprite.en.gif b/src/lib/libraries/decks/steps/story-pick-sprite2.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/story-pick-another-sprite.en.gif
rename to src/lib/libraries/decks/steps/story-pick-sprite2.en.gif
diff --git a/src/lib/libraries/decks/steps/story-pick-another-sprite.es.gif b/src/lib/libraries/decks/steps/story-pick-sprite2.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/story-pick-another-sprite.es.gif
rename to src/lib/libraries/decks/steps/story-pick-sprite2.es.gif
diff --git a/src/lib/libraries/decks/steps/videosens-add-extension.en.gif b/src/lib/libraries/decks/steps/video-add-extension.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/videosens-add-extension.en.gif
rename to src/lib/libraries/decks/steps/video-add-extension.en.gif
diff --git a/src/lib/libraries/decks/steps/videosens-add-extension.es.gif b/src/lib/libraries/decks/steps/video-add-extension.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/videosens-add-extension.es.gif
rename to src/lib/libraries/decks/steps/video-add-extension.es.gif
diff --git a/src/lib/libraries/decks/steps/videosens-animate.en.gif b/src/lib/libraries/decks/steps/video-animate.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/videosens-animate.en.gif
rename to src/lib/libraries/decks/steps/video-animate.en.gif
diff --git a/src/lib/libraries/decks/steps/videosens-animate.es.gif b/src/lib/libraries/decks/steps/video-animate.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/videosens-animate.es.gif
rename to src/lib/libraries/decks/steps/video-animate.es.gif
diff --git a/src/lib/libraries/decks/steps/videosens-pet-cat.en.gif b/src/lib/libraries/decks/steps/video-pet.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/videosens-pet-cat.en.gif
rename to src/lib/libraries/decks/steps/video-pet.en.gif
diff --git a/src/lib/libraries/decks/steps/videosens-pet-cat.es.gif b/src/lib/libraries/decks/steps/video-pet.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/videosens-pet-cat.es.gif
rename to src/lib/libraries/decks/steps/video-pet.es.gif
diff --git a/src/lib/libraries/decks/steps/videosens-pop.en.gif b/src/lib/libraries/decks/steps/video-pop.en.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/videosens-pop.en.gif
rename to src/lib/libraries/decks/steps/video-pop.en.gif
diff --git a/src/lib/libraries/decks/steps/videosens-pop.es.gif b/src/lib/libraries/decks/steps/video-pop.es.gif
similarity index 100%
rename from src/lib/libraries/decks/steps/videosens-pop.es.gif
rename to src/lib/libraries/decks/steps/video-pop.es.gif
diff --git a/src/lib/libraries/decks/translate-image.js b/src/lib/libraries/decks/translate-image.js
index 72bc77e96..d64965a18 100644
--- a/src/lib/libraries/decks/translate-image.js
+++ b/src/lib/libraries/decks/translate-image.js
@@ -10,7 +10,7 @@ let savedLocale = '';
 
 const loadSpanish = () =>
     import(/* webpackChunkName: "es-steps" */ './es-steps.js')
-        .then(({default: imageData}) => imageData);
+        .then(({esImages: imageData}) => imageData);
 
 const translations = {
     es: () => loadSpanish()