[IM] Updating fn names to make them consistent