diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
index 1627a211a4..06403855c1 100644
--- a/interface/cassandra.thrift
+++ b/interface/cassandra.thrift
@@ -5,9 +5,10 @@
 #
 
 namespace java org.apache.cassandra.service
-namespace py org.apache.cassandra
 namespace cpp org.apache.cassandra
-namespace php org.apache.cassandra
+namespace csharp Apache.Cassandra
+namespace py cassandra
+namespace php cassandra
 
 
 #
diff --git a/test/system/__init__.py b/test/system/__init__.py
index 68d083ff34..8db6719158 100644
--- a/test/system/__init__.py
+++ b/test/system/__init__.py
@@ -11,7 +11,7 @@ from thrift.protocol import TBinaryProtocol
 L = os.path.abspath(__file__).split(os.path.sep)[:-3]
 root = os.path.sep.join(L)
 _ipath = os.path.join(root, 'interface', 'gen-py')
-sys.path.append(os.path.join(_ipath, 'org', 'apache', 'cassandra'))
+sys.path.append(os.path.join(_ipath, 'cassandra'))
 import Cassandra
 
 host, port = '127.0.0.1', 9160