Updated per @mrioan to make variables less confusing.

Author: dogeared

tutorials/spring-boot/04-a-finer-grain-of-control/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -70,25 +70,25 @@ String home(HttpServletRequest req, Model model) {
     @RequestMapping("/userdetails")
     String userDetails(HttpServletRequest req, Model model) {
         Account account = accountResolver.getAccount(req);
-        Map<String, Set<Permission>> springSecurityPermissions = new HashMap<>();
+        Map<String, Set<Permission>> aggregatePermissionsModel = new HashMap<>();
 
         // groups & group perms
         List<Group> groups = new ArrayList<>();
         for (Group group : account.getGroups()) {
             groups.add(group);
-            springSecurityPermissions.put(
+            aggregatePermissionsModel.put(
                 "group:" + group.getName(),
                 stormpathGroupPermissionResolver.resolvePermissions(group)
             );
         }
         model.addAttribute("groups", groups);
 
         // account perms
-        springSecurityPermissions.put(
+        aggregatePermissionsModel.put(
             "account",
             stormpathAccountPermissionResolver.resolvePermissions(account)
         );
-        model.addAttribute("springSecurityPermissions", springSecurityPermissions);
+        model.addAttribute("aggregatePermissionsModel", aggregatePermissionsModel);
 
         return "userdetails";
     }

tutorials/spring-boot/04-a-finer-grain-of-control/src/main/resources/templates/userdetails.html

@@ -45,7 +45,7 @@ <h2>You have these permissions:</h2>
                             <th>Source</th>
                             <th>Spring Security Permissions</th>
                         </tr>
-                        <tr th:each="permission: ${springSecurityPermissions}">
+                        <tr th:each="permission: ${aggregatePermissionsModel}">
                             <td th:text="${permission.key}"/>
                             <td>
                                 <span th:each="value: ${permission.value}" th:inline="text">[[${value}]]<br/></span>

tutorials/spring/04-a-finer-grain-of-control/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -70,25 +70,25 @@ String home(HttpServletRequest req, Model model) {
     @RequestMapping("/userdetails")
     String userDetails(HttpServletRequest req, Model model) {
         Account account = accountResolver.getAccount(req);
-        Map<String, Set<Permission>> springSecurityPermissions = new HashMap<>();
+        Map<String, Set<Permission>> aggregatePermissionsModel = new HashMap<>();
 
         // groups & group perms
         List<Group> groups = new ArrayList<>();
         for (Group group : account.getGroups()) {
             groups.add(group);
-            springSecurityPermissions.put(
+            aggregatePermissionsModel.put(
                 "group:" + group.getName(),
                 stormpathGroupPermissionResolver.resolvePermissions(group)
             );
         }
         model.addAttribute("groups", groups);
 
         // account perms
-        springSecurityPermissions.put(
+        aggregatePermissionsModel.put(
             "account",
             stormpathAccountPermissionResolver.resolvePermissions(account)
         );
-        model.addAttribute("springSecurityPermissions", springSecurityPermissions);
+        model.addAttribute("aggregatePermissionsModel", aggregatePermissionsModel);
 
         return "userdetails";
     }

tutorials/spring/04-a-finer-grain-of-control/src/main/webapp/WEB-INF/jsp/userdetails.jsp

@@ -69,7 +69,7 @@
                             <th>Source</th>
                             <th>Spring Security Permissions</th>
                         </tr>
-                        <c:forEach items="${springSecurityPermissions}" var="permission">
+                        <c:forEach items="${aggregatePermissionsModel}" var="permission">
                             <tr>
                                 <td>${permission.key}</td>
                                 <td><c:forEach items="${permission.value}" var="value">${value}<br/></c:forEach></td>