Implement non hardcoded db name

Taking "analysis" out of the picture