Rename files containing utility functions