BugFix: non static namespaces & non underscored class name