Minor improvements for name conversion

Hello,

I have suggestions for two changes in the Naming class for conversion of hyphenated names to camelcase. If there are numbers in the name the conversion result is not as expected in my view. The change consists of two simple commits you may apply each of them only one or neither of them if you like.