RepositoryUtils get rid of client file name issue with bad name