Corrected BUG spaces on added NS entity names