diff --git a/src/pg/sql/10_moran.sql b/src/pg/sql/10_moran.sql
index fdc2d0d..d0730e9 100644
--- a/src/pg/sql/10_moran.sql
+++ b/src/pg/sql/10_moran.sql
@@ -26,7 +26,7 @@ CREATE OR REPLACE FUNCTION
       permutations INT,
       geom_col TEXT,
       id_col TEXT)
-RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
   plpy.execute('SELECT cdb_crankshaft._cdb_crankshaft_activate_py()')
   from crankshaft.clustering import moran_local
@@ -44,10 +44,10 @@ CREATE OR REPLACE FUNCTION
     permutations INT DEFAULT 99,
     geom_col TEXT DEFAULT 'the_geom',
     id_col TEXT DEFAULT 'cartodb_id')
-RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
 
-  SELECT moran, quads, significance, ids, y
+  SELECT moran, quads, significance, rowid, y
   FROM cdb_crankshaft._CDB_AreasOfInterestLocal(subquery, attr, w_type, num_ngbrs, permutations, geom_col, id_col);
 
 $$ LANGUAGE SQL;
@@ -62,10 +62,10 @@ CREATE OR REPLACE FUNCTION
     permutations INT DEFAULT 99,
     geom_col TEXT DEFAULT 'the_geom',
     id_col TEXT DEFAULT 'cartodb_id')
-    RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+    RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
 
-  SELECT moran, quads, significance, ids, y
+  SELECT moran, quads, significance, rowid, y
   FROM cdb_crankshaft._CDB_AreasOfInterestLocal(subquery, attr, w_type, num_ngbrs, permutations, geom_col, id_col)
   WHERE quads IN ('HH', 'HL');
 
@@ -81,10 +81,10 @@ CREATE OR REPLACE FUNCTION
     permutations INT DEFAULT 99,
     geom_col TEXT DEFAULT 'the_geom',
     id_col TEXT DEFAULT 'cartodb_id')
-    RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+    RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
 
-  SELECT moran, quads, significance, ids, y
+  SELECT moran, quads, significance, rowid, y
   FROM cdb_crankshaft._CDB_AreasOfInterestLocal(subquery, attr, w_type, num_ngbrs, permutations, geom_col, id_col)
   WHERE quads IN ('LL', 'LH');
 
@@ -100,10 +100,10 @@ CREATE OR REPLACE FUNCTION
     permutations INT DEFAULT 99,
     geom_col TEXT DEFAULT 'the_geom',
     id_col TEXT DEFAULT 'cartodb_id')
-    RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+    RETURNS TABLE (moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
 
-  SELECT moran, quads, significance, ids, y
+  SELECT moran, quads, significance, rowid, y
   FROM cdb_crankshaft._CDB_AreasOfInterestLocal(subquery, attr, w_type, num_ngbrs, permutations, geom_col, id_col)
   WHERE quads IN ('HL', 'LH');
 
@@ -141,7 +141,7 @@ CREATE OR REPLACE FUNCTION
       geom_col TEXT,
       id_col TEXT)
 RETURNS
-TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
   plpy.execute('SELECT cdb_crankshaft._cdb_crankshaft_activate_py()')
   from crankshaft.clustering import moran_local_rate
@@ -161,10 +161,10 @@ CREATE OR REPLACE FUNCTION
       geom_col TEXT DEFAULT 'the_geom',
       id_col TEXT DEFAULT 'cartodb_id')
 RETURNS
-TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
 
-  SELECT moran, quads, significance, ids, y
+  SELECT moran, quads, significance, rowid, y
   FROM cdb_crankshaft._CDB_AreasOfInterestLocalRate(subquery, numerator, denominator, w_type, num_ngbrs, permutations, geom_col, id_col);
 
 $$ LANGUAGE SQL;
@@ -181,10 +181,10 @@ CREATE OR REPLACE FUNCTION
       geom_col TEXT DEFAULT 'the_geom',
       id_col TEXT DEFAULT 'cartodb_id')
 RETURNS
-TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
 
-  SELECT moran, quads, significance, ids, y
+  SELECT moran, quads, significance, rowid, y
   FROM cdb_crankshaft._CDB_AreasOfInterestLocalRate(subquery, numerator, denominator, w_type, num_ngbrs, permutations, geom_col, id_col)
   WHERE quads IN ('HH', 'HL');
 
@@ -202,10 +202,10 @@ CREATE OR REPLACE FUNCTION
       geom_col TEXT DEFAULT 'the_geom',
       id_col TEXT DEFAULT 'cartodb_id')
 RETURNS
-TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
 
-  SELECT moran, quads, significance, ids, y
+  SELECT moran, quads, significance, rowid, y
   FROM cdb_crankshaft._CDB_AreasOfInterestLocalRate(subquery, numerator, denominator, w_type, num_ngbrs, permutations, geom_col, id_col)
   WHERE quads IN ('LL', 'LH');
 
@@ -223,10 +223,10 @@ CREATE OR REPLACE FUNCTION
       geom_col TEXT DEFAULT 'the_geom',
       id_col TEXT DEFAULT 'cartodb_id')
 RETURNS
-TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, ids INT, y NUMERIC)
+TABLE(moran NUMERIC, quads TEXT, significance NUMERIC, rowid INT, y NUMERIC)
 AS $$
 
-  SELECT moran, quads, significance, ids, y
+  SELECT moran, quads, significance, rowid, y
   FROM cdb_crankshaft._CDB_AreasOfInterestLocalRate(subquery, numerator, denominator, w_type, num_ngbrs, permutations, geom_col, id_col)
   WHERE quads IN ('HL', 'LH');
 
diff --git a/src/pg/test/sql/02_moran_test.sql b/src/pg/test/sql/02_moran_test.sql
index ca56186..5545a4a 100644
--- a/src/pg/test/sql/02_moran_test.sql
+++ b/src/pg/test/sql/02_moran_test.sql
@@ -11,7 +11,7 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
 SELECT ppoints.code, m.quads
   FROM ppoints
   JOIN cdb_crankshaft.CDB_AreasOfInterestLocal('SELECT * FROM ppoints', 'value') m
-    ON ppoints.cartodb_id = m.ids
+    ON ppoints.cartodb_id = m.rowid
   ORDER BY ppoints.code;
 
 SELECT cdb_crankshaft._cdb_random_seeds(1234);
@@ -20,7 +20,7 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
 SELECT ppoints.code, m.quads
   FROM ppoints
   JOIN cdb_crankshaft.CDB_GetSpatialHotspots('SELECT * FROM ppoints', 'value') m
-    ON ppoints.cartodb_id = m.ids
+    ON ppoints.cartodb_id = m.rowid
   ORDER BY ppoints.code;
 
 SELECT cdb_crankshaft._cdb_random_seeds(1234);
@@ -29,7 +29,7 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
 SELECT ppoints.code, m.quads
   FROM ppoints
   JOIN cdb_crankshaft.CDB_GetSpatialColdspots('SELECT * FROM ppoints', 'value') m
-    ON ppoints.cartodb_id = m.ids
+    ON ppoints.cartodb_id = m.rowid
   ORDER BY ppoints.code;
 
 SELECT cdb_crankshaft._cdb_random_seeds(1234);
@@ -38,7 +38,7 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
 SELECT ppoints.code, m.quads
   FROM ppoints
   JOIN cdb_crankshaft.CDB_GetSpatialOutliers('SELECT * FROM ppoints', 'value') m
-    ON ppoints.cartodb_id = m.ids
+    ON ppoints.cartodb_id = m.rowid
   ORDER BY ppoints.code;
 
 
@@ -48,16 +48,16 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
 SELECT ppoints2.code, m.quads
   FROM ppoints2
   JOIN cdb_crankshaft.CDB_AreasOfInterestLocalRate('SELECT * FROM ppoints2', 'numerator', 'denominator') m
-    ON ppoints2.cartodb_id = m.ids
+    ON ppoints2.cartodb_id = m.rowid
   ORDER BY ppoints2.code;
-    
+
 SELECT cdb_crankshaft._cdb_random_seeds(1234);
 
 -- Spatial Hotspots (rate)
 SELECT ppoints2.code, m.quads
   FROM ppoints2
   JOIN cdb_crankshaft.CDB_GetSpatialHotspotsRate('SELECT * FROM ppoints2', 'numerator', 'denominator') m
-    ON ppoints2.cartodb_id = m.ids
+    ON ppoints2.cartodb_id = m.rowid
   ORDER BY ppoints2.code;
 
 SELECT cdb_crankshaft._cdb_random_seeds(1234);
@@ -66,7 +66,7 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
 SELECT ppoints2.code, m.quads
   FROM ppoints2
   JOIN cdb_crankshaft.CDB_GetSpatialColdspotsRate('SELECT * FROM ppoints2', 'numerator', 'denominator') m
-    ON ppoints2.cartodb_id = m.ids
+    ON ppoints2.cartodb_id = m.rowid
   ORDER BY ppoints2.code;
 
 SELECT cdb_crankshaft._cdb_random_seeds(1234);
@@ -75,5 +75,5 @@ SELECT cdb_crankshaft._cdb_random_seeds(1234);
 SELECT ppoints2.code, m.quads
   FROM ppoints2
   JOIN cdb_crankshaft.CDB_GetSpatialOutliersRate('SELECT * FROM ppoints2', 'numerator', 'denominator') m
-    ON ppoints2.cartodb_id = m.ids
-  ORDER BY ppoints2.code;
\ No newline at end of file
+    ON ppoints2.cartodb_id = m.rowid
+  ORDER BY ppoints2.code;