diff --git a/libraries/wutdevoptab/devoptab_fs.c b/libraries/wutdevoptab/devoptab_fsa.cpp
similarity index 99%
rename from libraries/wutdevoptab/devoptab_fs.c
rename to libraries/wutdevoptab/devoptab_fsa.cpp
index c0bb0e811..395ad2f9c 100644
--- a/libraries/wutdevoptab/devoptab_fs.c
+++ b/libraries/wutdevoptab/devoptab_fsa.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 static devoptab_t
 __wut_fs_devoptab =
diff --git a/libraries/wutdevoptab/devoptab_fs.h b/libraries/wutdevoptab/devoptab_fsa.h
similarity index 100%
rename from libraries/wutdevoptab/devoptab_fs.h
rename to libraries/wutdevoptab/devoptab_fsa.h
diff --git a/libraries/wutdevoptab/devoptab_fs_chdir.c b/libraries/wutdevoptab/devoptab_fsa_chdir.cpp
similarity index 95%
rename from libraries/wutdevoptab/devoptab_fs_chdir.c
rename to libraries/wutdevoptab/devoptab_fsa_chdir.cpp
index 6a1f13eb8..3964a55f1 100644
--- a/libraries/wutdevoptab/devoptab_fs_chdir.c
+++ b/libraries/wutdevoptab/devoptab_fsa_chdir.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_chdir(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_chmod.c b/libraries/wutdevoptab/devoptab_fsa_chmod.cpp
similarity index 96%
rename from libraries/wutdevoptab/devoptab_fs_chmod.c
rename to libraries/wutdevoptab/devoptab_fsa_chmod.cpp
index a644d2f69..76420083c 100644
--- a/libraries/wutdevoptab/devoptab_fs_chmod.c
+++ b/libraries/wutdevoptab/devoptab_fsa_chmod.cpp
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_chmod(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_close.c b/libraries/wutdevoptab/devoptab_fsa_close.cpp
similarity index 94%
rename from libraries/wutdevoptab/devoptab_fs_close.c
rename to libraries/wutdevoptab/devoptab_fsa_close.cpp
index 490f7c741..f5740863e 100644
--- a/libraries/wutdevoptab/devoptab_fs_close.c
+++ b/libraries/wutdevoptab/devoptab_fsa_close.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_close(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_dirclose.c b/libraries/wutdevoptab/devoptab_fsa_dirclose.cpp
similarity index 94%
rename from libraries/wutdevoptab/devoptab_fs_dirclose.c
rename to libraries/wutdevoptab/devoptab_fsa_dirclose.cpp
index 6380d010b..494b91d51 100644
--- a/libraries/wutdevoptab/devoptab_fs_dirclose.c
+++ b/libraries/wutdevoptab/devoptab_fsa_dirclose.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_dirclose(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_dirnext.c b/libraries/wutdevoptab/devoptab_fsa_dirnext.cpp
similarity index 96%
rename from libraries/wutdevoptab/devoptab_fs_dirnext.c
rename to libraries/wutdevoptab/devoptab_fsa_dirnext.cpp
index e145516d7..22a223cdf 100644
--- a/libraries/wutdevoptab/devoptab_fs_dirnext.c
+++ b/libraries/wutdevoptab/devoptab_fsa_dirnext.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_dirnext(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_diropen.c b/libraries/wutdevoptab/devoptab_fsa_diropen.cpp
similarity index 96%
rename from libraries/wutdevoptab/devoptab_fs_diropen.c
rename to libraries/wutdevoptab/devoptab_fsa_diropen.cpp
index 6a830b1fc..dc48fa73a 100644
--- a/libraries/wutdevoptab/devoptab_fs_diropen.c
+++ b/libraries/wutdevoptab/devoptab_fsa_diropen.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 DIR_ITER *
 __wut_fs_diropen(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_dirreset.c b/libraries/wutdevoptab/devoptab_fsa_dirreset.cpp
similarity index 94%
rename from libraries/wutdevoptab/devoptab_fs_dirreset.c
rename to libraries/wutdevoptab/devoptab_fsa_dirreset.cpp
index 143678b46..2a1ffd74b 100644
--- a/libraries/wutdevoptab/devoptab_fs_dirreset.c
+++ b/libraries/wutdevoptab/devoptab_fsa_dirreset.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_dirreset(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_fchmod.c b/libraries/wutdevoptab/devoptab_fsa_fchmod.cpp
similarity index 87%
rename from libraries/wutdevoptab/devoptab_fs_fchmod.c
rename to libraries/wutdevoptab/devoptab_fsa_fchmod.cpp
index a15ffeb6f..a6ab414e7 100644
--- a/libraries/wutdevoptab/devoptab_fs_fchmod.c
+++ b/libraries/wutdevoptab/devoptab_fsa_fchmod.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_fchmod(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_fstat.c b/libraries/wutdevoptab/devoptab_fsa_fstat.cpp
similarity index 95%
rename from libraries/wutdevoptab/devoptab_fs_fstat.c
rename to libraries/wutdevoptab/devoptab_fsa_fstat.cpp
index 78fa880c3..9d2e29a73 100644
--- a/libraries/wutdevoptab/devoptab_fs_fstat.c
+++ b/libraries/wutdevoptab/devoptab_fsa_fstat.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_fstat(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_fsync.c b/libraries/wutdevoptab/devoptab_fsa_fsync.cpp
similarity index 94%
rename from libraries/wutdevoptab/devoptab_fs_fsync.c
rename to libraries/wutdevoptab/devoptab_fsa_fsync.cpp
index a464d8ea7..69acdc38f 100644
--- a/libraries/wutdevoptab/devoptab_fs_fsync.c
+++ b/libraries/wutdevoptab/devoptab_fsa_fsync.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_fsync(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_link.c b/libraries/wutdevoptab/devoptab_fsa_link.cpp
similarity index 85%
rename from libraries/wutdevoptab/devoptab_fs_link.c
rename to libraries/wutdevoptab/devoptab_fsa_link.cpp
index da772fe90..7eb7add36 100644
--- a/libraries/wutdevoptab/devoptab_fs_link.c
+++ b/libraries/wutdevoptab/devoptab_fsa_link.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_link(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_mkdir.c b/libraries/wutdevoptab/devoptab_fsa_mkdir.cpp
similarity index 95%
rename from libraries/wutdevoptab/devoptab_fs_mkdir.c
rename to libraries/wutdevoptab/devoptab_fsa_mkdir.cpp
index 1a2bdb75b..e4312bec7 100644
--- a/libraries/wutdevoptab/devoptab_fs_mkdir.c
+++ b/libraries/wutdevoptab/devoptab_fsa_mkdir.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_mkdir(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_open.c b/libraries/wutdevoptab/devoptab_fsa_open.cpp
similarity index 99%
rename from libraries/wutdevoptab/devoptab_fs_open.c
rename to libraries/wutdevoptab/devoptab_fsa_open.cpp
index 6795f3d2b..5abc33adf 100644
--- a/libraries/wutdevoptab/devoptab_fs_open.c
+++ b/libraries/wutdevoptab/devoptab_fsa_open.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 // Extended "magic" value that allows opening files with FS_OPEN_FLAG_UNENCRYPTED in underlying FSOpenFileEx() call similar to O_DIRECTORY
 #define O_UNENCRYPTED 0x4000000
diff --git a/libraries/wutdevoptab/devoptab_fs_read.c b/libraries/wutdevoptab/devoptab_fsa_read.cpp
similarity index 98%
rename from libraries/wutdevoptab/devoptab_fs_read.c
rename to libraries/wutdevoptab/devoptab_fsa_read.cpp
index 405b456b1..a14b61c7f 100644
--- a/libraries/wutdevoptab/devoptab_fs_read.c
+++ b/libraries/wutdevoptab/devoptab_fsa_read.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 #include <sys/param.h>
 
diff --git a/libraries/wutdevoptab/devoptab_fs_rename.c b/libraries/wutdevoptab/devoptab_fsa_rename.cpp
similarity index 96%
rename from libraries/wutdevoptab/devoptab_fs_rename.c
rename to libraries/wutdevoptab/devoptab_fsa_rename.cpp
index 2f2538d77..2b89f0373 100644
--- a/libraries/wutdevoptab/devoptab_fs_rename.c
+++ b/libraries/wutdevoptab/devoptab_fsa_rename.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_rename(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_rmdir.c b/libraries/wutdevoptab/devoptab_fsa_rmdir.cpp
similarity index 95%
rename from libraries/wutdevoptab/devoptab_fs_rmdir.c
rename to libraries/wutdevoptab/devoptab_fsa_rmdir.cpp
index 0c2526816..8200f0c67 100644
--- a/libraries/wutdevoptab/devoptab_fs_rmdir.c
+++ b/libraries/wutdevoptab/devoptab_fsa_rmdir.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_rmdir(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_seek.c b/libraries/wutdevoptab/devoptab_fsa_seek.cpp
similarity index 98%
rename from libraries/wutdevoptab/devoptab_fs_seek.c
rename to libraries/wutdevoptab/devoptab_fsa_seek.cpp
index c665da7b6..8e6b1bf73 100644
--- a/libraries/wutdevoptab/devoptab_fs_seek.c
+++ b/libraries/wutdevoptab/devoptab_fsa_seek.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 off_t
 __wut_fs_seek(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_stat.c b/libraries/wutdevoptab/devoptab_fsa_stat.cpp
similarity index 96%
rename from libraries/wutdevoptab/devoptab_fs_stat.c
rename to libraries/wutdevoptab/devoptab_fsa_stat.cpp
index 9a1893056..7b2a8dcb0 100644
--- a/libraries/wutdevoptab/devoptab_fs_stat.c
+++ b/libraries/wutdevoptab/devoptab_fsa_stat.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_stat(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_statvfs.c b/libraries/wutdevoptab/devoptab_fsa_statvfs.cpp
similarity index 87%
rename from libraries/wutdevoptab/devoptab_fs_statvfs.c
rename to libraries/wutdevoptab/devoptab_fsa_statvfs.cpp
index bc38cf414..e2fb2dcf5 100644
--- a/libraries/wutdevoptab/devoptab_fs_statvfs.c
+++ b/libraries/wutdevoptab/devoptab_fsa_statvfs.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_statvfs(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_truncate.c b/libraries/wutdevoptab/devoptab_fsa_truncate.cpp
similarity index 96%
rename from libraries/wutdevoptab/devoptab_fs_truncate.c
rename to libraries/wutdevoptab/devoptab_fsa_truncate.cpp
index fee1a9dc4..13ca9fb24 100644
--- a/libraries/wutdevoptab/devoptab_fs_truncate.c
+++ b/libraries/wutdevoptab/devoptab_fsa_truncate.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_ftruncate(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_unlink.c b/libraries/wutdevoptab/devoptab_fsa_unlink.cpp
similarity index 95%
rename from libraries/wutdevoptab/devoptab_fs_unlink.c
rename to libraries/wutdevoptab/devoptab_fsa_unlink.cpp
index d53c6ec48..e5f6b6fd4 100644
--- a/libraries/wutdevoptab/devoptab_fs_unlink.c
+++ b/libraries/wutdevoptab/devoptab_fsa_unlink.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_unlink(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_utils.c b/libraries/wutdevoptab/devoptab_fsa_utils.cpp
similarity index 99%
rename from libraries/wutdevoptab/devoptab_fs_utils.c
rename to libraries/wutdevoptab/devoptab_fsa_utils.cpp
index bc2b5f915..bacc51665 100644
--- a/libraries/wutdevoptab/devoptab_fs_utils.c
+++ b/libraries/wutdevoptab/devoptab_fsa_utils.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 #include "../wutnewlib/wut_clock.h"
 
 char *
diff --git a/libraries/wutdevoptab/devoptab_fs_utimes.c b/libraries/wutdevoptab/devoptab_fsa_utimes.cpp
similarity index 85%
rename from libraries/wutdevoptab/devoptab_fs_utimes.c
rename to libraries/wutdevoptab/devoptab_fsa_utimes.cpp
index 0ede99890..2f07f5eac 100644
--- a/libraries/wutdevoptab/devoptab_fs_utimes.c
+++ b/libraries/wutdevoptab/devoptab_fsa_utimes.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 int
 __wut_fs_utimes(struct _reent *r,
diff --git a/libraries/wutdevoptab/devoptab_fs_write.c b/libraries/wutdevoptab/devoptab_fsa_write.cpp
similarity index 98%
rename from libraries/wutdevoptab/devoptab_fs_write.c
rename to libraries/wutdevoptab/devoptab_fsa_write.cpp
index 8fcd5f783..e9b18fce5 100644
--- a/libraries/wutdevoptab/devoptab_fs_write.c
+++ b/libraries/wutdevoptab/devoptab_fsa_write.cpp
@@ -1,4 +1,4 @@
-#include "devoptab_fs.h"
+#include "devoptab_fsa.h"
 
 ssize_t __wut_fs_write(struct _reent *r, void *fd, const char *ptr, size_t len) {
    if (!fd || !ptr) {