Index: trunk/grails-app/views/period/create.gsp
===================================================================
--- trunk/grails-app/views/frequency/create.gsp	(revision 118)
+++ trunk/grails-app/views/period/create.gsp	(revision 122)
@@ -5,19 +5,19 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create Frequency</title>         
+        <title>Create Period</title>         
     </head>
     <body>
         <div class="nav">
             <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">Frequency List</g:link></span>
+            <span class="menuButton"><g:link class="list" action="list">Period List</g:link></span>
         </div>
         <div class="body">
-            <h1>Create Frequency</h1>
+            <h1>Create Period</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
             </g:if>
-            <g:hasErrors bean="${frequencyInstance}">
+            <g:hasErrors bean="${periodInstance}">
             <div class="errors">
-                <g:renderErrors bean="${frequencyInstance}" as="list" />
+                <g:renderErrors bean="${periodInstance}" as="list" />
             </div>
             </g:hasErrors>
@@ -29,8 +29,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="frequency">Frequency:</label>
+                                    <label for="isActive">Is Active:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:frequencyInstance,field:'frequency','errors')}">
-                                    <input type="text" id="frequency" name="frequency" value="${fieldValue(bean:frequencyInstance,field:'frequency')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:periodInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${periodInstance?.isActive}" ></g:checkBox>
                                 </td>
                             </tr> 
@@ -38,8 +38,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
+                                    <label for="period">Period:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:frequencyInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${frequencyInstance?.isActive}" ></g:checkBox>
+                                <td valign="top" class="value ${hasErrors(bean:periodInstance,field:'period','errors')}">
+                                    <input type="text" id="period" name="period" value="${fieldValue(bean:periodInstance,field:'period')}"/>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/period/edit.gsp
===================================================================
--- trunk/grails-app/views/frequency/edit.gsp	(revision 118)
+++ trunk/grails-app/views/period/edit.gsp	(revision 122)
@@ -5,25 +5,25 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Edit Frequency</title>
+        <title>Edit Period</title>
     </head>
     <body>
         <div class="nav">
             <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">Frequency List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Frequency</g:link></span>
+            <span class="menuButton"><g:link class="list" action="list">Period List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Period</g:link></span>
         </div>
         <div class="body">
-            <h1>Edit Frequency</h1>
+            <h1>Edit Period</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
             </g:if>
-            <g:hasErrors bean="${frequencyInstance}">
+            <g:hasErrors bean="${periodInstance}">
             <div class="errors">
-                <g:renderErrors bean="${frequencyInstance}" as="list" />
+                <g:renderErrors bean="${periodInstance}" as="list" />
             </div>
             </g:hasErrors>
             <g:form method="post" >
-                <input type="hidden" name="id" value="${frequencyInstance?.id}" />
-                <input type="hidden" name="version" value="${frequencyInstance?.version}" />
+                <input type="hidden" name="id" value="${periodInstance?.id}" />
+                <input type="hidden" name="version" value="${periodInstance?.version}" />
                 <div class="dialog">
                     <table>
@@ -32,8 +32,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="frequency">Frequency:</label>
+                                    <label for="isActive">Is Active:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:frequencyInstance,field:'frequency','errors')}">
-                                    <input type="text" id="frequency" name="frequency" value="${fieldValue(bean:frequencyInstance,field:'frequency')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:periodInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${periodInstance?.isActive}" ></g:checkBox>
                                 </td>
                             </tr> 
@@ -41,8 +41,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
+                                    <label for="period">Period:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:frequencyInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${frequencyInstance?.isActive}" ></g:checkBox>
+                                <td valign="top" class="value ${hasErrors(bean:periodInstance,field:'period','errors')}">
+                                    <input type="text" id="period" name="period" value="${fieldValue(bean:periodInstance,field:'period')}"/>
                                 </td>
                             </tr> 
@@ -50,14 +50,14 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="lifePlans">Life Plans:</label>
+                                    <label for="recurringSchedules">Recurring Schedules:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:frequencyInstance,field:'lifePlans','errors')}">
+                                <td valign="top" class="value ${hasErrors(bean:periodInstance,field:'recurringSchedules','errors')}">
                                     
 <ul>
-<g:each var="l" in="${frequencyInstance?.lifePlans?}">
-    <li><g:link controller="lifePlan" action="show" id="${l.id}">${l?.encodeAsHTML()}</g:link></li>
+<g:each var="r" in="${periodInstance?.recurringSchedules?}">
+    <li><g:link controller="recurringSchedule" action="show" id="${r.id}">${r?.encodeAsHTML()}</g:link></li>
 </g:each>
 </ul>
-<g:link controller="lifePlan" params="['frequency.id':frequencyInstance?.id]" action="create">Add LifePlan</g:link>
+<g:link controller="recurringSchedule" params="['period.id':periodInstance?.id]" action="create">Add RecurringSchedule</g:link>
 
                                 </td>
Index: trunk/grails-app/views/period/list.gsp
===================================================================
--- trunk/grails-app/views/frequency/list.gsp	(revision 118)
+++ trunk/grails-app/views/period/list.gsp	(revision 122)
@@ -5,13 +5,13 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Frequency List</title>
+        <title>Period List</title>
     </head>
     <body>
         <div class="nav">
             <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="create" action="create">New Frequency</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Period</g:link></span>
         </div>
         <div class="body">
-            <h1>Frequency List</h1>
+            <h1>Period List</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -24,19 +24,19 @@
                    	        <g:sortableColumn property="id" title="Id" />
                         
-                   	        <g:sortableColumn property="frequency" title="Frequency" />
+                   	        <g:sortableColumn property="isActive" title="Is Active" />
                         
-                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                   	        <g:sortableColumn property="period" title="Period" />
                         
                         </tr>
                     </thead>
                     <tbody>
-                    <g:each in="${frequencyInstanceList}" status="i" var="frequencyInstance">
+                    <g:each in="${periodInstanceList}" status="i" var="periodInstance">
                         <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
                         
-                            <td><g:link action="show" id="${frequencyInstance.id}">${fieldValue(bean:frequencyInstance, field:'id')}</g:link></td>
+                            <td><g:link action="show" id="${periodInstance.id}">${fieldValue(bean:periodInstance, field:'id')}</g:link></td>
                         
-                            <td>${fieldValue(bean:frequencyInstance, field:'frequency')}</td>
+                            <td>${fieldValue(bean:periodInstance, field:'isActive')}</td>
                         
-                            <td>${fieldValue(bean:frequencyInstance, field:'isActive')}</td>
+                            <td>${fieldValue(bean:periodInstance, field:'period')}</td>
                         
                         </tr>
@@ -46,5 +46,5 @@
             </div>
             <div class="paginateButtons">
-                <g:paginate total="${frequencyInstanceTotal}" />
+                <g:paginate total="${periodInstanceTotal}" />
             </div>
         </div>
Index: trunk/grails-app/views/period/show.gsp
===================================================================
--- trunk/grails-app/views/frequency/show.gsp	(revision 118)
+++ trunk/grails-app/views/period/show.gsp	(revision 122)
@@ -5,14 +5,14 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Show Frequency</title>
+        <title>Show Period</title>
     </head>
     <body>
         <div class="nav">
             <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">Frequency List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Frequency</g:link></span>
+            <span class="menuButton"><g:link class="list" action="list">Period List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New Period</g:link></span>
         </div>
         <div class="body">
-            <h1>Show Frequency</h1>
+            <h1>Show Period</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -26,12 +26,5 @@
                             <td valign="top" class="name">Id:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:frequencyInstance, field:'id')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Frequency:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:frequencyInstance, field:'frequency')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:periodInstance, field:'id')}</td>
                             
                         </tr>
@@ -40,15 +33,22 @@
                             <td valign="top" class="name">Is Active:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:frequencyInstance, field:'isActive')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:periodInstance, field:'isActive')}</td>
                             
                         </tr>
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Life Plans:</td>
+                            <td valign="top" class="name">Period:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:periodInstance, field:'period')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Recurring Schedules:</td>
                             
                             <td  valign="top" style="text-align:left;" class="value">
                                 <ul>
-                                <g:each var="l" in="${frequencyInstance.lifePlans}">
-                                    <li><g:link controller="lifePlan" action="show" id="${l.id}">${l?.encodeAsHTML()}</g:link></li>
+                                <g:each var="r" in="${periodInstance.recurringSchedules}">
+                                    <li><g:link controller="recurringSchedule" action="show" id="${r.id}">${r?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
@@ -62,5 +62,5 @@
             <div class="buttons">
                 <g:form>
-                    <input type="hidden" name="id" value="${frequencyInstance?.id}" />
+                    <input type="hidden" name="id" value="${periodInstance?.id}" />
                     <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
                     <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
