changed namespace declaration in core classes