Fixed  reports
Merged bugfix and unification of names