Variable name improvement