Fixed namespace errors

Somehow i only slapped on the namespace SRF; and went on my merry way
thinking this would be enough. d0h!

Change-Id: I328ea42554fa0712050b27061972fcd30d856a62