Fixing namespace renaming aftermath

Renaming done in change Id5aca089151063022dd0468e37589b54f78c7e3e obviously skipped some
integer parts of the code.

Change-Id: I2a2850177f7768fc83d88aa22d78902287254e2e