diff --git a/Makefile b/Makefile
index 3a0234f50f36fb45461fe235c1a91addd4d6214b..aca4a73ad069916cfb22910dcd28a083a4d2214e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc1-o
 NAME = Blurry Fish Butt
 
 # *DOCUMENTATION*
diff --git a/fs/orangefs/Makefile b/fs/orangefs/Makefile
index 828b36a6916dcdf092c7a7340b116bb50eb9e305..a9d6a968fe6de9c1f00e5e4f6273c1820b8c9f29 100644
--- a/fs/orangefs/Makefile
+++ b/fs/orangefs/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_ORANGEFS_FS) += orangefs.o
 
-orangefs-objs := acl.o file.o pvfs2-cache.o pvfs2-utils.o xattr.o dcache.o \
-		 inode.o pvfs2-sysfs.o pvfs2-mod.o super.o devpvfs2-req.o \
-		 namei.o symlink.o dir.o pvfs2-bufmap.o \
-		 pvfs2-debugfs.o waitqueue.o
+orangefs-objs := acl.o file.o orangefs-cache.o orangefs-utils.o xattr.o \
+		 dcache.o inode.o orangefs-sysfs.o orangefs-mod.o super.o \
+		 devorangefs-req.o namei.o symlink.o dir.o orangefs-bufmap.o \
+		 orangefs-debugfs.o waitqueue.o
diff --git a/fs/orangefs/acl.c b/fs/orangefs/acl.c
index 5e27d5fcb6bf0e6ffbeb700f93dd5f85307c015f..03f89dbb2512a8469ad9513c9a4d81613e1a243f 100644
--- a/fs/orangefs/acl.c
+++ b/fs/orangefs/acl.c
@@ -5,8 +5,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 #include <linux/posix_acl_xattr.h>
 #include <linux/fs_struct.h>
 
diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c
index 12c916fa4c7f6b49d0809982e5b4bf15c10bae7b..5dd9841df64e2d53c872b790840a15e910f108fb 100644
--- a/fs/orangefs/dcache.c
+++ b/fs/orangefs/dcache.c
@@ -9,7 +9,7 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
+#include "orangefs-kernel.h"
 
 /* Returns 1 if dentry can still be trusted, else 0. */
 static int orangefs_revalidate_lookup(struct dentry *dentry)
diff --git a/fs/orangefs/devpvfs2-req.c b/fs/orangefs/devorangefs-req.c
similarity index 99%
rename from fs/orangefs/devpvfs2-req.c
rename to fs/orangefs/devorangefs-req.c
index e18149f0975b8e09387df16cb2fa567b139dbe6c..e74938d575d60d4d4090d7549498dd4ce47d6d15 100644
--- a/fs/orangefs/devpvfs2-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -8,9 +8,9 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-dev-proto.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-dev-proto.h"
+#include "orangefs-bufmap.h"
 
 #include <linux/debugfs.h>
 #include <linux/slab.h>
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c
index 452d589b9747e04729092a47140c437931ad34cb..c043894fc2bd8f337da5e8e68c53cb3707d15d7f 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -5,8 +5,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 struct readdir_handle_s {
 	int buffer_index;
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index ae5d8ed67ed53265a9d47fa272e8e7ca3f1a2499..171013ae00363209517bacbe5e445232f0f63a28 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -9,8 +9,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 #include <linux/fs.h>
 #include <linux/pagemap.h>
 
@@ -186,7 +186,7 @@ static ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inod
 	}
 
 	if (ret < 0) {
-		handle_io_error(); /* defined in pvfs2-kernel.h */
+		handle_io_error();
 		/*
 		 * don't write an error to syslog on signaled operation
 		 * termination unless we've got debugging turned on, as
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 58e83182d3dc7cd1ddf5049ac39c18893a6f56e6..4724c92b61acb41889d6d49efc9d9729ac4e76ab 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -9,8 +9,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 static int read_one_page(struct page *page)
 {
@@ -125,7 +125,7 @@ static int orangefs_releasepage(struct page *page, gfp_t foo)
  * AIO. Modeled after NFS, they do this too.
  */
 /*
- * static ssize_t pvfs2_direct_IO(int rw,
+ * static ssize_t orangefs_direct_IO(int rw,
  *			struct kiocb *iocb,
  *			struct iov_iter *iter,
  *			loff_t offset)
@@ -150,7 +150,7 @@ const struct address_space_operations orangefs_address_operations = {
 	.readpages = orangefs_readpages,
 	.invalidatepage = orangefs_invalidatepage,
 	.releasepage = orangefs_releasepage,
-/*	.direct_IO = pvfs2_direct_IO */
+/*	.direct_IO = orangefs_direct_IO */
 };
 
 static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr)
diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index 333c87c8b0f52dae08e040fd883a2fb447906a3b..63aa1e7fbdb6ffa5fd1f991b3254324ea143092e 100644
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -9,7 +9,7 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
+#include "orangefs-kernel.h"
 
 /*
  * Get a newly allocated inode to go with a negative dentry.
diff --git a/fs/orangefs/pvfs2-bufmap.c b/fs/orangefs/orangefs-bufmap.c
similarity index 99%
rename from fs/orangefs/pvfs2-bufmap.c
rename to fs/orangefs/orangefs-bufmap.c
index 345287e871b1250028424403ea9a829b10407401..c5368d852ee28206b85f08adb972946251b682a7 100644
--- a/fs/orangefs/pvfs2-bufmap.c
+++ b/fs/orangefs/orangefs-bufmap.c
@@ -4,8 +4,8 @@
  * See COPYING in top-level directory.
  */
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 DECLARE_WAIT_QUEUE_HEAD(orangefs_bufmap_init_waitq);
 
diff --git a/fs/orangefs/pvfs2-bufmap.h b/fs/orangefs/orangefs-bufmap.h
similarity index 100%
rename from fs/orangefs/pvfs2-bufmap.h
rename to fs/orangefs/orangefs-bufmap.h
diff --git a/fs/orangefs/pvfs2-cache.c b/fs/orangefs/orangefs-cache.c
similarity index 99%
rename from fs/orangefs/pvfs2-cache.c
rename to fs/orangefs/orangefs-cache.c
index a224831770f4cc6837a93a0a2d0868128a7fb9aa..57e270246e3d9ed40bbccb99324481371b71e3dd 100644
--- a/fs/orangefs/pvfs2-cache.c
+++ b/fs/orangefs/orangefs-cache.c
@@ -5,7 +5,7 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
+#include "orangefs-kernel.h"
 
 /* tags assigned to kernel upcall operations */
 static __u64 next_tag_value;
diff --git a/fs/orangefs/pvfs2-debug.h b/fs/orangefs/orangefs-debug.h
similarity index 100%
rename from fs/orangefs/pvfs2-debug.h
rename to fs/orangefs/orangefs-debug.h
diff --git a/fs/orangefs/pvfs2-debugfs.c b/fs/orangefs/orangefs-debugfs.c
similarity index 99%
rename from fs/orangefs/pvfs2-debugfs.c
rename to fs/orangefs/orangefs-debugfs.c
index 315dc538b723a3ccd2bc8ca3e95852a6e21889af..7319f1a2ecb80de08047731283ffe1cc33e282b6 100644
--- a/fs/orangefs/pvfs2-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -39,9 +39,9 @@
 
 #include <linux/uaccess.h>
 
-#include "pvfs2-debugfs.h"
+#include "orangefs-debugfs.h"
 #include "protocol.h"
-#include "pvfs2-kernel.h"
+#include "orangefs-kernel.h"
 
 static int orangefs_debug_disabled = 1;
 
diff --git a/fs/orangefs/pvfs2-debugfs.h b/fs/orangefs/orangefs-debugfs.h
similarity index 100%
rename from fs/orangefs/pvfs2-debugfs.h
rename to fs/orangefs/orangefs-debugfs.h
diff --git a/fs/orangefs/pvfs2-dev-proto.h b/fs/orangefs/orangefs-dev-proto.h
similarity index 100%
rename from fs/orangefs/pvfs2-dev-proto.h
rename to fs/orangefs/orangefs-dev-proto.h
diff --git a/fs/orangefs/pvfs2-kernel.h b/fs/orangefs/orangefs-kernel.h
similarity index 99%
rename from fs/orangefs/pvfs2-kernel.h
rename to fs/orangefs/orangefs-kernel.h
index 33fcf3bccd2e925eded767336cb0d5485bf1aeaf..840872389fc5a1c03fa05ab290418352e8de7e6d 100644
--- a/fs/orangefs/pvfs2-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -53,7 +53,7 @@
 
 #include <asm/unaligned.h>
 
-#include "pvfs2-dev-proto.h"
+#include "orangefs-dev-proto.h"
 
 #ifdef ORANGEFS_KERNEL_DEBUG
 #define ORANGEFS_DEFAULT_OP_TIMEOUT_SECS       10
diff --git a/fs/orangefs/pvfs2-mod.c b/fs/orangefs/orangefs-mod.c
similarity index 98%
rename from fs/orangefs/pvfs2-mod.c
rename to fs/orangefs/orangefs-mod.c
index d8642908a917d37fee95d3420591eed3f2134964..fa2fca6dca7cdc174eb96ebd64c2daba8ade7669 100644
--- a/fs/orangefs/pvfs2-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -8,9 +8,9 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-debugfs.h"
-#include "pvfs2-sysfs.h"
+#include "orangefs-kernel.h"
+#include "orangefs-debugfs.h"
+#include "orangefs-sysfs.h"
 
 /* ORANGEFS_VERSION is a ./configure define */
 #ifndef ORANGEFS_VERSION
@@ -152,7 +152,7 @@ static int __init orangefs_init(void)
 	if (ret  < 0)
 		goto cleanup_inode;
 
-	/* Initialize the pvfsdev subsystem. */
+	/* Initialize the orangefsdev subsystem. */
 	ret = orangefs_dev_init();
 	if (ret < 0) {
 		gossip_err("orangefs: could not initialize device subsystem %d!\n",
diff --git a/fs/orangefs/pvfs2-sysfs.c b/fs/orangefs/orangefs-sysfs.c
similarity index 99%
rename from fs/orangefs/pvfs2-sysfs.c
rename to fs/orangefs/orangefs-sysfs.c
index f04de2593c79c4370eefa20eade60f96425ebdf0..3d360383ea222277a93e49c3a0b404858e2095a9 100644
--- a/fs/orangefs/pvfs2-sysfs.c
+++ b/fs/orangefs/orangefs-sysfs.c
@@ -99,8 +99,8 @@
 #include <linux/init.h>
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-sysfs.h"
+#include "orangefs-kernel.h"
+#include "orangefs-sysfs.h"
 
 #define ORANGEFS_KOBJ_ID "orangefs"
 #define ACACHE_KOBJ_ID "acache"
diff --git a/fs/orangefs/pvfs2-sysfs.h b/fs/orangefs/orangefs-sysfs.h
similarity index 100%
rename from fs/orangefs/pvfs2-sysfs.h
rename to fs/orangefs/orangefs-sysfs.h
diff --git a/fs/orangefs/pvfs2-utils.c b/fs/orangefs/orangefs-utils.c
similarity index 99%
rename from fs/orangefs/pvfs2-utils.c
rename to fs/orangefs/orangefs-utils.c
index d132c5f712a4182615b9a8bce3bd5054b15f5a08..fa2a46521b7aa4df6f325b9db56ff374ad5e52b3 100644
--- a/fs/orangefs/pvfs2-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -4,9 +4,9 @@
  * See COPYING in top-level directory.
  */
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-dev-proto.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-dev-proto.h"
+#include "orangefs-bufmap.h"
 
 __s32 fsid_of_op(struct orangefs_kernel_op_s *op)
 {
diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h
index 5f10ebc83e76b7282c763a190983de70679f80b5..03bbe7505a35661644991357a26e10ca70987c6b 100644
--- a/fs/orangefs/protocol.h
+++ b/fs/orangefs/protocol.h
@@ -130,7 +130,7 @@ typedef __s64 ORANGEFS_offset;
 /* Bits 6 - 0 are reserved for the actual error code. */
 #define ORANGEFS_ERROR_NUMBER_BITS 0x7f
 
-/* Encoded errno values are decoded by PINT_errno_mapping in pvfs2-utils.c. */
+/* Encoded errno values decoded by PINT_errno_mapping in orangefs-utils.c. */
 
 /* Our own ORANGEFS protocol error codes. */
 #define ORANGEFS_ECANCEL    (1|ORANGEFS_NON_ERRNO_ERROR_BIT|ORANGEFS_ERROR_BIT)
@@ -352,7 +352,7 @@ struct dev_mask2_info_s {
 __s32 ORANGEFS_util_translate_mode(int mode);
 
 /* pvfs2-debug.h ************************************************************/
-#include "pvfs2-debug.h"
+#include "orangefs-debug.h"
 
 /* pvfs2-internal.h *********************************************************/
 #define llu(x) (unsigned long long)(x)
@@ -402,7 +402,7 @@ enum {
 
 /*
  * describes memory regions to map in the ORANGEFS_DEV_MAP ioctl.
- * NOTE: See devpvfs2-req.c for 32 bit compat structure.
+ * NOTE: See devorangefs-req.c for 32 bit compat structure.
  * Since this structure has a variable-sized layout that is different
  * on 32 and 64 bit platforms, we need to normalize to a 64 bit layout
  * on such systems before servicing ioctl calls from user-space binaries
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index c104de1ae5de88e5cf5426e5a530dc2ef5b3a806..52bc522ea21c54adddeafeac0b0b09bf4b8344b5 100644
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -5,8 +5,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 #include <linux/parser.h>
 
diff --git a/fs/orangefs/symlink.c b/fs/orangefs/symlink.c
index 321f626b190b7db79bf979aef748dbc8271e5a73..1b3ae63463dc5b48b77ddbec0553e8b53f7363a1 100644
--- a/fs/orangefs/symlink.c
+++ b/fs/orangefs/symlink.c
@@ -5,8 +5,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 static const char *orangefs_follow_link(struct dentry *dentry, void **cookie)
 {
diff --git a/fs/orangefs/waitqueue.c b/fs/orangefs/waitqueue.c
index cfc8dc59c4eba67507b289e63852edf09ffdc717..c731cbdd5fbddcc9a9cbbd841ecbb9eab0337fb8 100644
--- a/fs/orangefs/waitqueue.c
+++ b/fs/orangefs/waitqueue.c
@@ -13,8 +13,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 
 /*
  * What we do in this function is to walk the list of operations that are
diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c
index aeb3c30835910dbe3671d9bb19596adca874cf37..0e4e016027389395c6728a7f913503e202cad4d8 100644
--- a/fs/orangefs/xattr.c
+++ b/fs/orangefs/xattr.c
@@ -9,8 +9,8 @@
  */
 
 #include "protocol.h"
-#include "pvfs2-kernel.h"
-#include "pvfs2-bufmap.h"
+#include "orangefs-kernel.h"
+#include "orangefs-bufmap.h"
 #include <linux/posix_acl_xattr.h>
 #include <linux/xattr.h>