update generator + fix same name in ___value !!!