-%define db_path %{TZ_SYS_RO_ETC}/system_info_db
-%define model_config_path /opt/system/model-config
-%define db_runtime_path %{model_config_path}/system_info_db
+
+%define model_config_ro_path %{_sysconfdir}/config/model-config.xml
+%define db_ro_path %{TZ_SYS_RO_ETC}/system_info_db
+%define model_config_rw_dir /opt/system/model-config
+%define db_rw_path %{model_config_rw_dir}/system_info_db