change namespace for more compatibility