fixed polyformizm. Cahcnged namespace and class names