Tweak naming
Tweak notation