Improves variable names for admin namespace