LAMBDA-27: templates/portal/collection renamed