Changed namespace and class names