Fixed more namespacing for admin