FOP-3160: Rename util to avoid conflicts with core
21 files changed