value adjustment and fix naming problem