[bug 1025925] - Make utils a consistent file name

r?