Changed class names back to jinni