Fixed namespace for classes