removed NSG prefix from entity names

NSG prefix still in class names though