Refactor FSO renaming functions