fix yellow code (NPE) and change literal to constant from CommonClassNames
use CommonClassNames constants for standard FQNs
Merge remote-tracking branch 'origin/master'