Cleaned up remaining uses of regexes instead of path.basename