Fixed scope of subscriber call
Added normalization of mapping names