Add proper names to analyzer output
Think before committing stuff...