Small fixes

Loic Hausammannrequested to merge
renaming into master

With the renaming, I have introduced some compilations errors. Here I am simply fixing them.

Merge request reports