Corrected message names
Reduced duplication in ObjectInfo
Improved logging in mapping conventions