diff --git a/src/components/login/login.jsx b/src/components/login/login.jsx
index 7b5aa1476..73c1e6ad7 100644
--- a/src/components/login/login.jsx
+++ b/src/components/login/login.jsx
@@ -50,7 +50,7 @@ var Login = React.createClass({
                         </Button>
                     ] : [
                         <Button className="submit-button white" type="submit" key="submitButton">
-                            <FormattedMessage id='general.logIn' />
+                            <FormattedMessage id='general.signIn' />
                         </Button>
                     ]}
                     <a className="right" href="/accounts/password_reset/" key="passwordResetLink">
diff --git a/src/components/navigation/www/navigation.jsx b/src/components/navigation/www/navigation.jsx
index 620c4720a..1b8a3b265 100644
--- a/src/components/navigation/www/navigation.jsx
+++ b/src/components/navigation/www/navigation.jsx
@@ -300,7 +300,7 @@ var Navigation = React.createClass({
                         ] : [
                             <li className="link right join" key="join">
                                 <a href="#" onClick={this.handleJoinClick}>
-                                    <FormattedMessage id="general.signUp" />
+                                    <FormattedMessage id="general.joinScratch" />
                                 </a>
                             </li>,
                             <Registration
@@ -314,7 +314,7 @@ var Navigation = React.createClass({
                                     onClick={this.handleLoginClick}
                                     className="ignore-react-onclickoutside"
                                     key="login-link">
-                                        <FormattedMessage id="general.logIn" />
+                                        <FormattedMessage id="general.signIn" />
                                </a>
                                 <Dropdown
                                         className="login-dropdown with-arrow"
diff --git a/src/l10n.json b/src/l10n.json
index c6cf1919b..3685f0c1d 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -27,7 +27,7 @@
     "general.guidelines": "Community Guidelines",
     "general.help": "Help",
     "general.jobs": "Jobs",
-    "general.signUp": "Sign Up",
+    "general.joinScratch": "Join Scratch",
     "general.legal": "Legal",
     "general.loadMore": "Load More",
     "general.learnMore": "Learn More",
@@ -62,7 +62,7 @@
     "general.scratchFoundation": "Scratch Foundation",
     "general.scratchJr": "ScratchJr",
     "general.search": "Search",
-    "general.logIn": "Log in",
+    "general.signIn": "Sign in",
     "general.statistics": "Statistics",
     "general.studios": "Studios",
     "general.support": "Support",
diff --git a/test/localization/spot_check_nav.js b/test/localization/spot_check_nav.js
index a9b611c71..9babf4dcb 100644
--- a/test/localization/spot_check_nav.js
+++ b/test/localization/spot_check_nav.js
@@ -20,8 +20,8 @@ var languagesToCheck = [
     'he', 'zh-cn', 'ja', 'pt-br', 'pl', 'nb'
 ];
 var idsToCheck = [
-    'general.about', 'general.create', 'general.help', 'general.signUp',
-    'general.logIn', 'general.discuss'
+    'general.about', 'general.create', 'general.help', 'general.joinScratch',
+    'general.signIn', 'general.discuss'
 ];