naming improvements
more naming fixes; use UserRole isof 42