removing use of builtin names; refactoring portlet blocking