Changes due to renaming of util method