Added namespace-prefix to all definitions