rename util classes