I just did large cleanup of data in Gammu phone database. So there should be no duplicates and all phones should be in correct category. Please take care on selected manufacturer when you add new phones as otherwise people lookig for phone from specific manufacturer are confused.
I also fixed case of some letters in names, however I'm definitely not sure whether new variants are 100% correct as I don't know all phones :-).