renamed namespaces to more cloesly follow java conventions