removed Base convetion from naming classes now that we are namespaced