Tweak naming of function