changed namespace style