Add filename transforms, rename transform functions since we have two now