Namespace cleanup. Added PropertyName fro control naming convention duri...

Namespace cleanup. Added PropertyName for control naming convention during serialization