Revert back to config.metric_store and config.user_store (instead of appending '_name')