diff --git a/extra/oauth/authors.txt b/extra/oauth1/authors.txt
similarity index 100%
rename from extra/oauth/authors.txt
rename to extra/oauth1/authors.txt
diff --git a/extra/oauth/oauth-tests.factor b/extra/oauth1/oauth1-tests.factor
similarity index 86%
rename from extra/oauth/oauth-tests.factor
rename to extra/oauth1/oauth1-tests.factor
index e4ccf391ba..49a0c17e36 100644
--- a/extra/oauth/oauth-tests.factor
+++ b/extra/oauth1/oauth1-tests.factor
@@ -1,6 +1,6 @@
-USING: oauth oauth.private tools.test accessors kernel assocs
+USING: oauth1 oauth1.private tools.test accessors kernel assocs
 strings namespaces urls ;
-IN: oauth.tests
+IN: oauth1.tests
 
 { "%26&b" } [ "&" "b" hmac-key ] unit-test
 { "%26&" } [ "&" f hmac-key ] unit-test
diff --git a/extra/oauth/oauth.factor b/extra/oauth1/oauth1.factor
similarity index 99%
rename from extra/oauth/oauth.factor
rename to extra/oauth1/oauth1.factor
index f0a3c285f8..03d98f524c 100644
--- a/extra/oauth/oauth.factor
+++ b/extra/oauth1/oauth1.factor
@@ -4,7 +4,7 @@ USING: accessors assocs base64 calendar checksums.hmac
 checksums.sha combinators fry http http.client kernel locals
 make math math.parser namespaces present random sequences
 sorting strings urls urls.encoding urls.private ;
-IN: oauth
+IN: oauth1
 
 SYMBOL: consumer-token
 
diff --git a/extra/twitter/twitter.factor b/extra/twitter/twitter.factor
index 043ec73629..13e2d90208 100644
--- a/extra/twitter/twitter.factor
+++ b/extra/twitter/twitter.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators hashtables http
 http.client json.reader kernel macros make namespaces sequences
-io.sockets.secure fry oauth urls ;
+io.sockets.secure fry oauth1 urls ;
 IN: twitter
 
 ! Configuration