 --------------------------------------------------------------------
 ---------------------- Time series tables --------------------------
 --------------------------------------------------------------------
-CREATE TABLE calc_ego_hv_powerflow.bus_v_mag_set
+
+DROP TABLE IF EXISTS model_draft.ego_grid_pf_hv_bus_v_mag_set; 
+CREATE TABLE model_draft.ego_grid_pf_hv_bus_v_mag_set
 (
   scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying,
   bus_id bigint NOT NULL,
   temp_id integer NOT NULL,
   v_mag_pu_set double precision[], -- Unit: per unit...
   CONSTRAINT bus_v_mag_set_pkey PRIMARY KEY (bus_id, temp_id, scn_name),
-  CONSTRAINT bus_v_mag_set_temp_fkey FOREIGN KEY (temp_id) REFERENCES calc_ego_hv_powerflow.temp_resolution (temp_id)
+  CONSTRAINT bus_v_mag_set_temp_fkey FOREIGN KEY (temp_id) REFERENCES model_draft.ego_grid_pf_hv_temp_resolution (temp_id)
 )
 WITH (
   OIDS=FALSE
 );
 
 
-COMMENT ON TABLE  calc_ego_hv_powerflow.bus_v_mag_set IS
+COMMENT ON TABLE  model_draft.ego_grid_pf_hv_bus_v_mag_set IS
 '{
 "Name": "...",
 "Source": [{ 	  "Name": "open_eGo data-processing",

"Instructions for proper use": ["..."]
}';


CREATE TABLE calc_ego_hv_powerflow.bus
(
  scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying,
  bus_id bigint NOT NULL, -- Unit: n/a...

  efficiency_dispatch double precision, -- Unit: per unit...
  standing_loss double precision, -- Unit: per unit...
  CONSTRAINT storage_data_pkey PRIMARY KEY (storage_id, scn_name),
  CONSTRAINT storage_data_source_fkey FOREIGN KEY (source) REFERENCES model_draft.ego_grid_pf_hv_source (source_id)
)
WITH (
  OIDS=FALSE
);

COMMENT ON TABLE  model_draft.ego_grid_pf_hv_storage IS
'{
"Name": "storage in hv powerflow",
"Source": [{
