diff --git a/contrib/babel/langs/org-babel-oz.el b/contrib/babel/langs/ob-oz.el
similarity index 100%
rename from contrib/babel/langs/org-babel-oz.el
rename to contrib/babel/langs/ob-oz.el
diff --git a/lisp/babel/langs/org-babel-C.el b/lisp/babel/langs/ob-C.el
similarity index 100%
rename from lisp/babel/langs/org-babel-C.el
rename to lisp/babel/langs/ob-C.el
diff --git a/lisp/babel/langs/org-babel-R.el b/lisp/babel/langs/ob-R.el
similarity index 100%
rename from lisp/babel/langs/org-babel-R.el
rename to lisp/babel/langs/ob-R.el
diff --git a/lisp/babel/langs/org-babel-asymptote.el b/lisp/babel/langs/ob-asymptote.el
similarity index 100%
rename from lisp/babel/langs/org-babel-asymptote.el
rename to lisp/babel/langs/ob-asymptote.el
diff --git a/lisp/babel/langs/org-babel-clojure.el b/lisp/babel/langs/ob-clojure.el
similarity index 100%
rename from lisp/babel/langs/org-babel-clojure.el
rename to lisp/babel/langs/ob-clojure.el
diff --git a/lisp/babel/langs/org-babel-css.el b/lisp/babel/langs/ob-css.el
similarity index 100%
rename from lisp/babel/langs/org-babel-css.el
rename to lisp/babel/langs/ob-css.el
diff --git a/lisp/babel/langs/org-babel-ditaa.el b/lisp/babel/langs/ob-ditaa.el
similarity index 100%
rename from lisp/babel/langs/org-babel-ditaa.el
rename to lisp/babel/langs/ob-ditaa.el
diff --git a/lisp/babel/langs/org-babel-dot.el b/lisp/babel/langs/ob-dot.el
similarity index 100%
rename from lisp/babel/langs/org-babel-dot.el
rename to lisp/babel/langs/ob-dot.el
diff --git a/lisp/babel/langs/org-babel-emacs-lisp.el b/lisp/babel/langs/ob-emacs-lisp.el
similarity index 100%
rename from lisp/babel/langs/org-babel-emacs-lisp.el
rename to lisp/babel/langs/ob-emacs-lisp.el
diff --git a/lisp/babel/langs/org-babel-gnuplot.el b/lisp/babel/langs/ob-gnuplot.el
similarity index 100%
rename from lisp/babel/langs/org-babel-gnuplot.el
rename to lisp/babel/langs/ob-gnuplot.el
diff --git a/lisp/babel/langs/org-babel-haskell.el b/lisp/babel/langs/ob-haskell.el
similarity index 100%
rename from lisp/babel/langs/org-babel-haskell.el
rename to lisp/babel/langs/ob-haskell.el
diff --git a/lisp/babel/langs/org-babel-latex.el b/lisp/babel/langs/ob-latex.el
similarity index 100%
rename from lisp/babel/langs/org-babel-latex.el
rename to lisp/babel/langs/ob-latex.el
diff --git a/lisp/babel/langs/org-babel-matlab.el b/lisp/babel/langs/ob-matlab.el
similarity index 100%
rename from lisp/babel/langs/org-babel-matlab.el
rename to lisp/babel/langs/ob-matlab.el
diff --git a/lisp/babel/langs/org-babel-ocaml.el b/lisp/babel/langs/ob-ocaml.el
similarity index 100%
rename from lisp/babel/langs/org-babel-ocaml.el
rename to lisp/babel/langs/ob-ocaml.el
diff --git a/lisp/babel/langs/org-babel-octave.el b/lisp/babel/langs/ob-octave.el
similarity index 100%
rename from lisp/babel/langs/org-babel-octave.el
rename to lisp/babel/langs/ob-octave.el
diff --git a/lisp/babel/langs/org-babel-perl.el b/lisp/babel/langs/ob-perl.el
similarity index 100%
rename from lisp/babel/langs/org-babel-perl.el
rename to lisp/babel/langs/ob-perl.el
diff --git a/lisp/babel/langs/org-babel-python.el b/lisp/babel/langs/ob-python.el
similarity index 100%
rename from lisp/babel/langs/org-babel-python.el
rename to lisp/babel/langs/ob-python.el
diff --git a/lisp/babel/langs/org-babel-ruby.el b/lisp/babel/langs/ob-ruby.el
similarity index 100%
rename from lisp/babel/langs/org-babel-ruby.el
rename to lisp/babel/langs/ob-ruby.el
diff --git a/lisp/babel/langs/org-babel-sass.el b/lisp/babel/langs/ob-sass.el
similarity index 100%
rename from lisp/babel/langs/org-babel-sass.el
rename to lisp/babel/langs/ob-sass.el
diff --git a/lisp/babel/langs/org-babel-screen.el b/lisp/babel/langs/ob-screen.el
similarity index 100%
rename from lisp/babel/langs/org-babel-screen.el
rename to lisp/babel/langs/ob-screen.el
diff --git a/lisp/babel/langs/org-babel-sh.el b/lisp/babel/langs/ob-sh.el
similarity index 100%
rename from lisp/babel/langs/org-babel-sh.el
rename to lisp/babel/langs/ob-sh.el
diff --git a/lisp/babel/langs/org-babel-sql.el b/lisp/babel/langs/ob-sql.el
similarity index 100%
rename from lisp/babel/langs/org-babel-sql.el
rename to lisp/babel/langs/ob-sql.el
diff --git a/lisp/babel/org-babel-comint.el b/lisp/babel/ob-comint.el
similarity index 100%
rename from lisp/babel/org-babel-comint.el
rename to lisp/babel/ob-comint.el
diff --git a/lisp/babel/org-babel-exp.el b/lisp/babel/ob-exp.el
similarity index 100%
rename from lisp/babel/org-babel-exp.el
rename to lisp/babel/ob-exp.el
diff --git a/lisp/babel/org-babel-keys.el b/lisp/babel/ob-keys.el
similarity index 100%
rename from lisp/babel/org-babel-keys.el
rename to lisp/babel/ob-keys.el
diff --git a/lisp/babel/org-babel-lob.el b/lisp/babel/ob-lob.el
similarity index 100%
rename from lisp/babel/org-babel-lob.el
rename to lisp/babel/ob-lob.el
diff --git a/lisp/babel/org-babel-ref.el b/lisp/babel/ob-ref.el
similarity index 100%
rename from lisp/babel/org-babel-ref.el
rename to lisp/babel/ob-ref.el
diff --git a/lisp/babel/org-babel-table.el b/lisp/babel/ob-table.el
similarity index 100%
rename from lisp/babel/org-babel-table.el
rename to lisp/babel/ob-table.el
diff --git a/lisp/babel/org-babel-tangle.el b/lisp/babel/ob-tangle.el
similarity index 100%
rename from lisp/babel/org-babel-tangle.el
rename to lisp/babel/ob-tangle.el
diff --git a/lisp/babel/org-babel.el b/lisp/babel/ob.el
similarity index 100%
rename from lisp/babel/org-babel.el
rename to lisp/babel/ob.el