Naming convention and admin pool rework