Fixing declarations because of namespaces