Added namespaces to differentiate between conflicting class-names