Fixed Doctrine annotations and namespaces