Fix naming issues
Fix admin issue