Don't use the database name in the metric names (Fixes #3)