CodePro fixes on model and notification packedges

Author: lhunker