Update namespaces according to coding standards

Signed-off-by: Dries Vints <dries.vints@gmail.com>
Replaced spaces with tabs in ServiceProvider file

Signed-off-by: Dries Vints <dries.vints@gmail.com>