Variable naming tweak