removed default headers
fixed metric naming convention