Tweak naming
Update use of common functions