genBot: Name ingredient properties files accoring to bottle number

Gets rid of the duplicate name (once in file name, once inside the file)
and makes it less confusing