Fix double naming. fix bug