     FROM delete_objects;
 
   -- delete geometries and cityobjects
-  PERFORM citydb_pkg1.delete_cityobject_geometries(result_array);
-  PERFORM citydb_pkg1.intern_delete_cityobjects(result_array);
+  PERFORM citydb_pkg.delete_cityobject_geometries(result_array);
+  PERFORM citydb_pkg.intern_delete_cityobjects(result_array);
 
   RETURN result_array;
 END;
 $$
 LANGUAGE plpgsql STRICT;
 
-CREATE AGGREGATE citydb_pkg1.delete_rooms(int)
+CREATE AGGREGATE citydb_pkg.delete_rooms(int)
 (
     sfunc = array_append,
     stype = int[],
-    finalfunc = citydb_pkg1.delete_rooms
+    finalfunc = citydb_pkg.delete_rooms
 );
 
 /*****************************************************************

    RETURNING id INTO deleted_id;

  -- delete geometries and cityobject
  PERFORM citydb_pkg1.delete_cityobject_geometry(deleted_id);
  PERFORM citydb_pkg1.intern_delete_cityobject(deleted_id);

  RETURN deleted_id;
END;

* @return
* ID of deleted relief feature
******************************************************************/
CREATE OR REPLACE FUNCTION citydb_pkg.delete_relief_feature(int) RETURNS int AS
$$
DECLARE
  deleted_id int;
