@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class BaseSession
     {
 
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
-using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Buffer
     {
 
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TensorFlowNET.Core.Eager
+namespace Tensorflow.Eager
 {
     public class Context
     {
 
@@ -3,10 +3,9 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using Tensorflow;
 using TF_DataType = Tensorflow.DataType;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     /// <summary>
     /// TensorFlow uses a dataflow graph to represent your computation in terms of the dependencies between individual operations. 
 
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public sealed class MonoPInvokeCallbackAttribute : Attribute
     {
 
@@ -3,10 +3,9 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using Tensorflow;
 using static Tensorflow.OpDef.Types;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class OpDefLibrary
     {
@@ -39,7 +38,9 @@ public unsafe Operation _apply_op_helper(string op_type_name, string name = "",
                 name = op_type_name;
             }
 
-            foreach(var attr_def in op_def.Attr)
+            string scope = g.unique_name(name) + "/";
+
+            foreach (var attr_def in op_def.Attr)
             {
                 if (attr_def.Type != "type") continue;
                 var key = attr_def.Name;
@@ -84,7 +85,7 @@ public unsafe Operation _apply_op_helper(string op_type_name, string name = "",
             }
 
             var op = g.create_op(op_type_name, null, output_types.ToArray(),
-                name: "Placeholder_1/",
+                name: scope,
                 input_types: new DataType[] { },
                 attrs: attr_protos,
                 op_def: op_def);
 
@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 using TF_DataType = Tensorflow.DataType;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Operation
     {
 
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Session : BaseSession
     {
 
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Status
     {
 
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Tensorflow;
 
-namespace TensorFlowNET.Core
+namespace Tensorflow
 {
     public class Tensor
     {
Original file line number	Diff line number	Diff line change
@@ -1,9 +1,8 @@
1	1	using System;
2	2	using System.Collections.Generic;
3	3	using System.Text;
4		- using Tensorflow;
5	4
6		- namespace TensorFlowNET.Core
	5	+ namespace Tensorflow
7	6	{
8	7	public class BaseSession
9	8	{
Original file line number	Diff line number	Diff line change
@@ -2,9 +2,8 @@
2	2	using System.Collections.Generic;
3	3	using System.Runtime.InteropServices;
4	4	using System.Text;
5		- using Tensorflow;
6	5
7		- namespace TensorFlowNET.Core
	6	+ namespace Tensorflow
8	7	{
9	8	public class Buffer
10	9	{
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@
2	2	using System.Collections.Generic;
3	3	using System.Text;
4	4
5		- namespace TensorFlowNET.Core.Eager
	5	+ namespace Tensorflow.Eager
6	6	{
7	7	public class Context
8	8	{
Original file line number	Diff line number	Diff line change
@@ -3,10 +3,9 @@
3	3	using System.IO;
4	4	using System.Runtime.InteropServices;
5	5	using System.Text;
6		- using Tensorflow;
7	6	using static Tensorflow.OpDef.Types;
8	7
9		- namespace TensorFlowNET.Core
	8	+ namespace Tensorflow
10	9	{
11	10	public class OpDefLibrary
12	11	{
@@ -39,7 +38,9 @@ public unsafe Operation _apply_op_helper(string op_type_name, string name = "",
39	38	name = op_type_name;
40	39	}
41	40
42		- foreach(var attr_def in op_def.Attr)
	41	+ string scope = g.unique_name(name) + "/";
	42	+
	43	+ foreach (var attr_def in op_def.Attr)
43	44	{
44	45	if (attr_def.Type != "type") continue;
45	46	var key = attr_def.Name;
@@ -84,7 +85,7 @@ public unsafe Operation _apply_op_helper(string op_type_name, string name = "",
84	85	}
85	86
86	87	var op = g.create_op(op_type_name, null, output_types.ToArray(),
87		- name: "Placeholder_1/",
	88	+ name: scope,
88	89	input_types: new DataType[] { },
89	90	attrs: attr_protos,
90	91	op_def: op_def);
Original file line number	Diff line number	Diff line change
@@ -1,10 +1,9 @@
1	1	using System;
2	2	using System.Collections.Generic;
3	3	using System.Text;
4		- using Tensorflow;
5	4	using TF_DataType = Tensorflow.DataType;
6	5
7		- namespace TensorFlowNET.Core
	6	+ namespace Tensorflow
8	7	{
9	8	public class Operation
10	9	{