change names and put everything in exported FS namespace