diff --git a/src/components/academy/__tests__/Missions.tsx b/src/components/academy/__tests__/Missions.tsx
deleted file mode 100644
index 7299eed477..0000000000
--- a/src/components/academy/__tests__/Missions.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { mount } from 'enzyme'
-import * as React from 'react'
-import { MemoryRouter } from 'react-router'
-
-import { mockAssessmentOverviews } from '../../../mocks/api'
-import { mockRouterProps } from '../../../mocks/components'
-import Missions, { IMissionsProps } from '../Missions'
-
-const mockUndefinedMissions: IMissionsProps = {
-  ...mockRouterProps('/academy/missions', {}),
-  handleAssessmentOverviewFetch: () => {}
-}
-
-const mockEmptyMissions: IMissionsProps = {
-  ...mockRouterProps('/academy/missions', {}),
-  assessmentOverviews: [],
-  handleAssessmentOverviewFetch: () => {}
-}
-
-const mockPresentMissions: IMissionsProps = {
-  ...mockRouterProps('/academy/missions', {}),
-  assessmentOverviews: mockAssessmentOverviews,
-  handleAssessmentOverviewFetch: () => {}
-}
-
-test('Missions page "loading" content renders correctly', () => {
-  const app = (
-    <MemoryRouter initialEntries={['/unknown']}>
-      <Missions {...mockUndefinedMissions} />
-    </MemoryRouter>
-  )
-  const tree = mount(app)
-  expect(tree.debug()).toMatchSnapshot()
-})
-
-test('Missions page with 0 missions renders correctly', () => {
-  const app = (
-    <MemoryRouter initialEntries={['/unknown']}>
-      <Missions {...mockEmptyMissions} />
-    </MemoryRouter>
-  )
-  const tree = mount(app)
-  expect(tree.debug()).toMatchSnapshot()
-})
-
-test('Missions page with multiple loaded missions renders correctly', () => {
-  const app = (
-    <MemoryRouter initialEntries={['/unknown']}>
-      <Missions {...mockPresentMissions} />
-    </MemoryRouter>
-  )
-  const tree = mount(app)
-  expect(tree.debug()).toMatchSnapshot()
-})
diff --git a/src/components/academy/index.tsx b/src/components/academy/index.tsx
index eef12ebe29..63ea0adfaf 100644
--- a/src/components/academy/index.tsx
+++ b/src/components/academy/index.tsx
@@ -1,11 +1,14 @@
+/* tslint:disable: jsx-no-lambda */
+
 import * as qs from 'query-string'
 import * as React from 'react'
 import { Redirect, Route, RouteComponentProps, Switch } from 'react-router'
 
-import MissionsContainer from '../../containers/academy/MissionsContainer'
+import AssessmentListingContainer from '../../containers/assessment/AssessmentListingContainer'
 import Game from '../../containers/GameContainer'
 import { isAcademyRe } from '../../reducers/session'
 import { HistoryHelper } from '../../utils/history'
+import { AssessmentCategories, AssessmentCategory } from '../assessment/assessmentShape'
 import AcademyNavigationBar from './NavigationBar'
 
 interface IAcademyProps extends IDispatchProps, IOwnProps, IStateProps, RouteComponentProps<{}> {}
@@ -23,17 +26,37 @@ export interface IStateProps {
   historyHelper: HistoryHelper
 }
 
+const assessmentListingRenderFactory = (cat: AssessmentCategory) => (
+  routerProps: RouteComponentProps<any>
+) => <AssessmentListingContainer assessmentCategory={cat} />
+
 export const Academy: React.SFC<IAcademyProps> = props => (
   <div className="Academy">
     <AcademyNavigationBar />
     <Switch>
       {checkLoggedIn(props)}
-      <Route path="/academy/contests" component={MissionsContainer} />
+      <Route
+        path="/academy/contests"
+        render={assessmentListingRenderFactory(AssessmentCategories.CONTEST)}
+      />
       <Route path="/academy/game" component={Game} />
-      <Route exact={true} path="/academy/missions" component={MissionsContainer} />
-      <Route path="/academy/missions/:missionId" component={MissionsContainer} />
-      <Route path="/academy/paths" component={MissionsContainer} />
-      <Route path="/academy/sidequests" component={MissionsContainer} />
+      <Route
+        exact={true}
+        path="/academy/missions"
+        render={assessmentListingRenderFactory(AssessmentCategories.MISSION)}
+      />
+      <Route
+        path="/academy/missions/:assessmentId"
+        render={assessmentListingRenderFactory(AssessmentCategories.MISSION)}
+      />
+      <Route
+        path="/academy/paths"
+        render={assessmentListingRenderFactory(AssessmentCategories.PATH)}
+      />
+      <Route
+        path="/academy/sidequests"
+        render={assessmentListingRenderFactory(AssessmentCategories.SIDEQUEST)}
+      />
       <Route exact={true} path="/academy" component={dynamicRedirect(props)} />
       <Route component={redirectTo404} />
     </Switch>
diff --git a/src/components/academy/Missions.tsx b/src/components/assessment/AssessmentListing.tsx
similarity index 51%
rename from src/components/academy/Missions.tsx
rename to src/components/assessment/AssessmentListing.tsx
index f7412603bb..2ecfdcac29 100644
--- a/src/components/academy/Missions.tsx
+++ b/src/components/assessment/AssessmentListing.tsx
@@ -4,47 +4,50 @@ import * as React from 'react'
 import { RouteComponentProps } from 'react-router'
 import { NavLink } from 'react-router-dom'
 
-import AssessmentContainer from '../../containers/AssessmentContainer'
+import AssessmentContainer from '../../containers/assessment'
 import { OwnProps as AssessmentProps } from '../assessment'
+import { AssessmentCategory } from '../assessment/assessmentShape'
 import { IAssessmentOverview } from '../assessment/assessmentShape'
 import ContentDisplay, { IContentDisplayProps } from '../commons/ContentDisplay'
 
-export interface IMissionParams {
-  missionId?: string
+export interface IAssessmentParams {
+  assessmentId?: string
 }
 
-export interface IMissionsProps extends RouteComponentProps<IMissionParams> {
+export interface IAssessmentListingProps extends RouteComponentProps<IAssessmentParams> {
   assessmentOverviews?: IAssessmentOverview[]
+  assessmentCategory: AssessmentCategory
   handleAssessmentOverviewFetch: () => void
 }
 
-export type StateProps = Pick<IMissionsProps, 'assessmentOverviews'>
-export type DispatchProps = Pick<IMissionsProps, 'handleAssessmentOverviewFetch'>
+export type DispatchProps = Pick<IAssessmentListingProps, 'handleAssessmentOverviewFetch'>
+export type OwnProps = Pick<IAssessmentListingProps, 'assessmentCategory'>
+export type StateProps = Pick<IAssessmentListingProps, 'assessmentOverviews'>
 
-class Missions extends React.Component<IMissionsProps, {}> {
+class AssessmentListing extends React.Component<IAssessmentListingProps, {}> {
   public render() {
-    // make missionIdParam a number
-    let missionIdParam: number | null =
-      this.props.match.params.missionId === undefined
+    // make assessmentId a number
+    let assessmentIdParam: number | null =
+      this.props.match.params.assessmentId === undefined
         ? NaN
-        : parseInt(this.props.match.params.missionId, 10)
+        : parseInt(this.props.match.params.assessmentId, 10)
     // set as null if the parsing failed
-    missionIdParam = Number.isInteger(missionIdParam) ? missionIdParam : null
+    assessmentIdParam = Number.isInteger(assessmentIdParam) ? assessmentIdParam : null
 
-    // if there is no mission specified, Render only information.
-    if (missionIdParam === null) {
+    // if there is no assessmentId specified, Render only information.
+    if (assessmentIdParam === null) {
       const props: IContentDisplayProps = {
         display: <AssessmentOverviewCard assessmentOverviews={this.props.assessmentOverviews} />,
         loadContentDispatch: this.props.handleAssessmentOverviewFetch
       }
       return (
-        <div className="Missions">
+        <div className="AssessmentListing">
           <ContentDisplay {...props} />
         </div>
       )
     } else {
       const props: AssessmentProps = {
-        missionId: missionIdParam
+        assessmentId: assessmentIdParam
       }
       return <AssessmentContainer {...props} />
     }
@@ -61,31 +64,31 @@ export const AssessmentOverviewCard: React.SFC<IAssessmentOverviewCardProps> = p
   } else if (props.assessmentOverviews.length === 0) {
     return <NonIdealState title="There are no assessments." visual={IconNames.FLAME} />
   }
-  const cards = props.assessmentOverviews.map((mission, index) => (
+  const cards = props.assessmentOverviews.map((overview, index) => (
     <div key={index}>
-      <Card className="row mission-info">
-        <div className="col-xs-3 mission-info-picture">PICTURE</div>
-        <div className="col-xs-9 mission-info-text">
-          <div className="row mission-info-title">
-            <h4>{mission.title}</h4>
+      <Card className="row listing">
+        <div className="col-xs-3 listing-picture">PICTURE</div>
+        <div className="col-xs-9 listing-text">
+          <div className="row listing-title">
+            <h4>{overview.title}</h4>
           </div>
-          <div className="row mission-info-order">
+          <div className="row listing-order">
             <h6>Mission 0 : 123123 XP (hardcoded)</h6>
           </div>
-          <div className="row mission-info-description">
-            <p className="col-xs-12">{mission.shortSummary}</p>
+          <div className="row listing-description">
+            <p className="col-xs-12">{overview.shortSummary}</p>
           </div>
-          <div className="row between-xs middle-xs mission-info-controls">
-            <div className="col-xs-8 mission-info-due-date-parent">
-              <Text className="mission-info-due-date">
-                <Icon className="mission-info-due-icon" iconSize={14} icon={IconNames.TIME} />
+          <div className="row between-xs middle-xs listing-controls">
+            <div className="col-xs-8 listing-due-date-parent">
+              <Text className="listing-due-date">
+                <Icon className="listing-due-icon" iconSize={14} icon={IconNames.TIME} />
                 Due: 12/12/12
               </Text>
             </div>
             <div className="col-xs">
-              <NavLink to={`/academy/missions/${mission.id.toString()}`}>
+              <NavLink to={`/academy/missions/${overview.id.toString()}`}>
                 <Button
-                  className="mission-info-skip-button"
+                  className="listing-skip-button"
                   minimal={true}
                   intent={Intent.PRIMARY}
                   icon={IconNames.FLAME}
@@ -102,4 +105,4 @@ export const AssessmentOverviewCard: React.SFC<IAssessmentOverviewCardProps> = p
   return <>{cards}</>
 }
 
-export default Missions
+export default AssessmentListing
diff --git a/src/components/assessment/__tests__/AssessmentListing.tsx b/src/components/assessment/__tests__/AssessmentListing.tsx
new file mode 100644
index 0000000000..4dd01e941b
--- /dev/null
+++ b/src/components/assessment/__tests__/AssessmentListing.tsx
@@ -0,0 +1,58 @@
+import { mount } from 'enzyme'
+import * as React from 'react'
+import { MemoryRouter } from 'react-router'
+
+import { mockAssessmentOverviews } from '../../../mocks/api'
+import { mockRouterProps } from '../../../mocks/components'
+import AssessmentListing, { IAssessmentListingProps } from '../AssessmentListing'
+import { AssessmentCategories } from '../assessmentShape'
+
+const mockUndefinedAssessmentListing: IAssessmentListingProps = {
+  ...mockRouterProps('/academy/missions', {}),
+  handleAssessmentOverviewFetch: () => {},
+  assessmentCategory: AssessmentCategories.MISSION
+}
+
+const mockEmptyAssessmentListing: IAssessmentListingProps = {
+  ...mockRouterProps('/academy/missions', {}),
+  assessmentOverviews: [],
+  handleAssessmentOverviewFetch: () => {},
+  assessmentCategory: AssessmentCategories.MISSION
+}
+
+const mockPresentAssessmentListing: IAssessmentListingProps = {
+  ...mockRouterProps('/academy/missions', {}),
+  assessmentOverviews: mockAssessmentOverviews,
+  handleAssessmentOverviewFetch: () => {},
+  assessmentCategory: AssessmentCategories.MISSION
+}
+
+test('AssessmentListing page "loading" content renders correctly', () => {
+  const app = (
+    <MemoryRouter initialEntries={['/unknown']}>
+      <AssessmentListing {...mockUndefinedAssessmentListing} />
+    </MemoryRouter>
+  )
+  const tree = mount(app)
+  expect(tree.debug()).toMatchSnapshot()
+})
+
+test('AssessmentListing page with 0 missions renders correctly', () => {
+  const app = (
+    <MemoryRouter initialEntries={['/unknown']}>
+      <AssessmentListing {...mockEmptyAssessmentListing} />
+    </MemoryRouter>
+  )
+  const tree = mount(app)
+  expect(tree.debug()).toMatchSnapshot()
+})
+
+test('AssessmentListing page with multiple loaded missions renders correctly', () => {
+  const app = (
+    <MemoryRouter initialEntries={['/unknown']}>
+      <AssessmentListing {...mockPresentAssessmentListing} />
+    </MemoryRouter>
+  )
+  const tree = mount(app)
+  expect(tree.debug()).toMatchSnapshot()
+})
diff --git a/src/components/academy/__tests__/__snapshots__/Missions.tsx.snap b/src/components/assessment/__tests__/__snapshots__/AssessmentListing.tsx.snap
similarity index 78%
rename from src/components/academy/__tests__/__snapshots__/Missions.tsx.snap
rename to src/components/assessment/__tests__/__snapshots__/AssessmentListing.tsx.snap
index f486527f38..d468ede2c8 100644
--- a/src/components/academy/__tests__/__snapshots__/Missions.tsx.snap
+++ b/src/components/assessment/__tests__/__snapshots__/AssessmentListing.tsx.snap
@@ -1,10 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Missions page "loading" content renders correctly 1`] = `
+exports[`AssessmentListing page "loading" content renders correctly 1`] = `
 "<MemoryRouter initialEntries={{...}}>
   <Router history={{...}}>
-    <Missions match={{...}} location={{...}} history={{...}} staticContext={{...}} handleAssessmentOverviewFetch={[Function: handleAssessmentOverviewFetch]}>
-      <div className=\\"Missions\\">
+    <AssessmentListing match={{...}} location={{...}} history={{...}} staticContext={{...}} handleAssessmentOverviewFetch={[Function: handleAssessmentOverviewFetch]} assessmentCategory=\\"Mission\\">
+      <div className=\\"AssessmentListing\\">
         <ContentDisplay display={{...}} loadContentDispatch={[Function: handleAssessmentOverviewFetch]}>
           <div className=\\"ContentDisplay row center-xs\\">
             <div className=\\"col-xs-10 contentdisplay-content-parent\\">
@@ -37,16 +37,16 @@ exports[`Missions page "loading" content renders correctly 1`] = `
           </div>
         </ContentDisplay>
       </div>
-    </Missions>
+    </AssessmentListing>
   </Router>
 </MemoryRouter>"
 `;
 
-exports[`Missions page with 0 missions renders correctly 1`] = `
+exports[`AssessmentListing page with 0 missions renders correctly 1`] = `
 "<MemoryRouter initialEntries={{...}}>
   <Router history={{...}}>
-    <Missions match={{...}} location={{...}} history={{...}} staticContext={{...}} assessmentOverviews={{...}} handleAssessmentOverviewFetch={[Function: handleAssessmentOverviewFetch]}>
-      <div className=\\"Missions\\">
+    <AssessmentListing match={{...}} location={{...}} history={{...}} staticContext={{...}} assessmentOverviews={{...}} handleAssessmentOverviewFetch={[Function: handleAssessmentOverviewFetch]} assessmentCategory=\\"Mission\\">
+      <div className=\\"AssessmentListing\\">
         <ContentDisplay display={{...}} loadContentDispatch={[Function: handleAssessmentOverviewFetch]}>
           <div className=\\"ContentDisplay row center-xs\\">
             <div className=\\"col-xs-10 contentdisplay-content-parent\\">
@@ -77,16 +77,16 @@ exports[`Missions page with 0 missions renders correctly 1`] = `
           </div>
         </ContentDisplay>
       </div>
-    </Missions>
+    </AssessmentListing>
   </Router>
 </MemoryRouter>"
 `;
 
-exports[`Missions page with multiple loaded missions renders correctly 1`] = `
+exports[`AssessmentListing page with multiple loaded missions renders correctly 1`] = `
 "<MemoryRouter initialEntries={{...}}>
   <Router history={{...}}>
-    <Missions match={{...}} location={{...}} history={{...}} staticContext={{...}} assessmentOverviews={{...}} handleAssessmentOverviewFetch={[Function: handleAssessmentOverviewFetch]}>
-      <div className=\\"Missions\\">
+    <AssessmentListing match={{...}} location={{...}} history={{...}} staticContext={{...}} assessmentOverviews={{...}} handleAssessmentOverviewFetch={[Function: handleAssessmentOverviewFetch]} assessmentCategory=\\"Mission\\">
+      <div className=\\"AssessmentListing\\">
         <ContentDisplay display={{...}} loadContentDispatch={[Function: handleAssessmentOverviewFetch]}>
           <div className=\\"ContentDisplay row center-xs\\">
             <div className=\\"col-xs-10 contentdisplay-content-parent\\">
@@ -94,33 +94,33 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                 <div className=\\"pt-card pt-elevation-1 contentdisplay-content\\">
                   <Component assessmentOverviews={{...}}>
                     <div>
-                      <Blueprint2.Card className=\\"row mission-info\\" elevation={0} interactive={false}>
-                        <div className=\\"pt-card pt-elevation-0 row mission-info\\">
-                          <div className=\\"col-xs-3 mission-info-picture\\">
+                      <Blueprint2.Card className=\\"row listing\\" elevation={0} interactive={false}>
+                        <div className=\\"pt-card pt-elevation-0 row listing\\">
+                          <div className=\\"col-xs-3 listing-picture\\">
                             PICTURE
                           </div>
-                          <div className=\\"col-xs-9 mission-info-text\\">
-                            <div className=\\"row mission-info-title\\">
+                          <div className=\\"col-xs-9 listing-text\\">
+                            <div className=\\"row listing-title\\">
                               <h4>
                                 An Odessey to Runes
                               </h4>
                             </div>
-                            <div className=\\"row mission-info-order\\">
+                            <div className=\\"row listing-order\\">
                               <h6>
                                 Mission 0 : 123123 XP (hardcoded)
                               </h6>
                             </div>
-                            <div className=\\"row mission-info-description\\">
+                            <div className=\\"row listing-description\\">
                               <p className=\\"col-xs-12\\">
                                 Once upon a time, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nec vulputate sapien. Fusce vel lacus fermentum, efficitur ipsum.
                               </p>
                             </div>
-                            <div className=\\"row between-xs middle-xs mission-info-controls\\">
-                              <div className=\\"col-xs-8 mission-info-due-date-parent\\">
-                                <Text className=\\"mission-info-due-date\\">
-                                  <div className=\\"mission-info-due-date\\" title={[undefined]}>
-                                    <Blueprint2.Icon className=\\"mission-info-due-icon\\" iconSize={14} icon=\\"time\\">
-                                      <svg className=\\"pt-icon mission-info-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
+                            <div className=\\"row between-xs middle-xs listing-controls\\">
+                              <div className=\\"col-xs-8 listing-due-date-parent\\">
+                                <Text className=\\"listing-due-date\\">
+                                  <div className=\\"listing-due-date\\" title={[undefined]}>
+                                    <Blueprint2.Icon className=\\"listing-due-icon\\" iconSize={14} icon=\\"time\\">
+                                      <svg className=\\"pt-icon listing-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
                                         <title>
                                           time
                                         </title>
@@ -136,8 +136,8 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                                   <Route path=\\"/academy/missions/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
                                     <Link to=\\"/academy/missions/0\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
                                       <a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/0\\">
-                                        <Blueprint2.Button className=\\"mission-info-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
-                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary mission-info-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
+                                        <Blueprint2.Button className=\\"listing-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
+                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary listing-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
                                             <Blueprint2.Icon icon=\\"flame\\">
                                               <svg className=\\"pt-icon\\" style={{...}} data-icon=\\"flame\\" width={16} height={16} viewBox=\\"0 0 16 16\\">
                                                 <title>
@@ -163,33 +163,33 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                       </Blueprint2.Card>
                     </div>
                     <div>
-                      <Blueprint2.Card className=\\"row mission-info\\" elevation={0} interactive={false}>
-                        <div className=\\"pt-card pt-elevation-0 row mission-info\\">
-                          <div className=\\"col-xs-3 mission-info-picture\\">
+                      <Blueprint2.Card className=\\"row listing\\" elevation={0} interactive={false}>
+                        <div className=\\"pt-card pt-elevation-0 row listing\\">
+                          <div className=\\"col-xs-3 listing-picture\\">
                             PICTURE
                           </div>
-                          <div className=\\"col-xs-9 mission-info-text\\">
-                            <div className=\\"row mission-info-title\\">
+                          <div className=\\"col-xs-9 listing-text\\">
+                            <div className=\\"row listing-title\\">
                               <h4>
                                 The Secret to Streams
                               </h4>
                             </div>
-                            <div className=\\"row mission-info-order\\">
+                            <div className=\\"row listing-order\\">
                               <h6>
                                 Mission 0 : 123123 XP (hardcoded)
                               </h6>
                             </div>
-                            <div className=\\"row mission-info-description\\">
+                            <div className=\\"row listing-description\\">
                               <p className=\\"col-xs-12\\">
                                 Once upon a time, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nec vulputate sapien. Fusce vel lacus fermentum, efficitur ipsum.
                               </p>
                             </div>
-                            <div className=\\"row between-xs middle-xs mission-info-controls\\">
-                              <div className=\\"col-xs-8 mission-info-due-date-parent\\">
-                                <Text className=\\"mission-info-due-date\\">
-                                  <div className=\\"mission-info-due-date\\" title={[undefined]}>
-                                    <Blueprint2.Icon className=\\"mission-info-due-icon\\" iconSize={14} icon=\\"time\\">
-                                      <svg className=\\"pt-icon mission-info-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
+                            <div className=\\"row between-xs middle-xs listing-controls\\">
+                              <div className=\\"col-xs-8 listing-due-date-parent\\">
+                                <Text className=\\"listing-due-date\\">
+                                  <div className=\\"listing-due-date\\" title={[undefined]}>
+                                    <Blueprint2.Icon className=\\"listing-due-icon\\" iconSize={14} icon=\\"time\\">
+                                      <svg className=\\"pt-icon listing-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
                                         <title>
                                           time
                                         </title>
@@ -205,8 +205,8 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                                   <Route path=\\"/academy/missions/1\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
                                     <Link to=\\"/academy/missions/1\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
                                       <a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/1\\">
-                                        <Blueprint2.Button className=\\"mission-info-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
-                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary mission-info-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
+                                        <Blueprint2.Button className=\\"listing-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
+                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary listing-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
                                             <Blueprint2.Icon icon=\\"flame\\">
                                               <svg className=\\"pt-icon\\" style={{...}} data-icon=\\"flame\\" width={16} height={16} viewBox=\\"0 0 16 16\\">
                                                 <title>
@@ -232,33 +232,33 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                       </Blueprint2.Card>
                     </div>
                     <div>
-                      <Blueprint2.Card className=\\"row mission-info\\" elevation={0} interactive={false}>
-                        <div className=\\"pt-card pt-elevation-0 row mission-info\\">
-                          <div className=\\"col-xs-3 mission-info-picture\\">
+                      <Blueprint2.Card className=\\"row listing\\" elevation={0} interactive={false}>
+                        <div className=\\"pt-card pt-elevation-0 row listing\\">
+                          <div className=\\"col-xs-3 listing-picture\\">
                             PICTURE
                           </div>
-                          <div className=\\"col-xs-9 mission-info-text\\">
-                            <div className=\\"row mission-info-title\\">
+                          <div className=\\"col-xs-9 listing-text\\">
+                            <div className=\\"row listing-title\\">
                               <h4>
                                 A sample Sidequest
                               </h4>
                             </div>
-                            <div className=\\"row mission-info-order\\">
+                            <div className=\\"row listing-order\\">
                               <h6>
                                 Mission 0 : 123123 XP (hardcoded)
                               </h6>
                             </div>
-                            <div className=\\"row mission-info-description\\">
+                            <div className=\\"row listing-description\\">
                               <p className=\\"col-xs-12\\">
                                 Once upon a time, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nec vulputate sapien. Fusce vel lacus fermentum, efficitur ipsum.
                               </p>
                             </div>
-                            <div className=\\"row between-xs middle-xs mission-info-controls\\">
-                              <div className=\\"col-xs-8 mission-info-due-date-parent\\">
-                                <Text className=\\"mission-info-due-date\\">
-                                  <div className=\\"mission-info-due-date\\" title={[undefined]}>
-                                    <Blueprint2.Icon className=\\"mission-info-due-icon\\" iconSize={14} icon=\\"time\\">
-                                      <svg className=\\"pt-icon mission-info-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
+                            <div className=\\"row between-xs middle-xs listing-controls\\">
+                              <div className=\\"col-xs-8 listing-due-date-parent\\">
+                                <Text className=\\"listing-due-date\\">
+                                  <div className=\\"listing-due-date\\" title={[undefined]}>
+                                    <Blueprint2.Icon className=\\"listing-due-icon\\" iconSize={14} icon=\\"time\\">
+                                      <svg className=\\"pt-icon listing-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
                                         <title>
                                           time
                                         </title>
@@ -274,8 +274,8 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                                   <Route path=\\"/academy/missions/2\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
                                     <Link to=\\"/academy/missions/2\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
                                       <a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/2\\">
-                                        <Blueprint2.Button className=\\"mission-info-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
-                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary mission-info-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
+                                        <Blueprint2.Button className=\\"listing-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
+                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary listing-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
                                             <Blueprint2.Icon icon=\\"flame\\">
                                               <svg className=\\"pt-icon\\" style={{...}} data-icon=\\"flame\\" width={16} height={16} viewBox=\\"0 0 16 16\\">
                                                 <title>
@@ -301,33 +301,33 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                       </Blueprint2.Card>
                     </div>
                     <div>
-                      <Blueprint2.Card className=\\"row mission-info\\" elevation={0} interactive={false}>
-                        <div className=\\"pt-card pt-elevation-0 row mission-info\\">
-                          <div className=\\"col-xs-3 mission-info-picture\\">
+                      <Blueprint2.Card className=\\"row listing\\" elevation={0} interactive={false}>
+                        <div className=\\"pt-card pt-elevation-0 row listing\\">
+                          <div className=\\"col-xs-3 listing-picture\\">
                             PICTURE
                           </div>
-                          <div className=\\"col-xs-9 mission-info-text\\">
-                            <div className=\\"row mission-info-title\\">
+                          <div className=\\"col-xs-9 listing-text\\">
+                            <div className=\\"row listing-title\\">
                               <h4>
                                 A closed Mission
                               </h4>
                             </div>
-                            <div className=\\"row mission-info-order\\">
+                            <div className=\\"row listing-order\\">
                               <h6>
                                 Mission 0 : 123123 XP (hardcoded)
                               </h6>
                             </div>
-                            <div className=\\"row mission-info-description\\">
+                            <div className=\\"row listing-description\\">
                               <p className=\\"col-xs-12\\">
                                 Once upon a time, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nec vulputate sapien. Fusce vel lacus fermentum, efficitur ipsum.
                               </p>
                             </div>
-                            <div className=\\"row between-xs middle-xs mission-info-controls\\">
-                              <div className=\\"col-xs-8 mission-info-due-date-parent\\">
-                                <Text className=\\"mission-info-due-date\\">
-                                  <div className=\\"mission-info-due-date\\" title={[undefined]}>
-                                    <Blueprint2.Icon className=\\"mission-info-due-icon\\" iconSize={14} icon=\\"time\\">
-                                      <svg className=\\"pt-icon mission-info-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
+                            <div className=\\"row between-xs middle-xs listing-controls\\">
+                              <div className=\\"col-xs-8 listing-due-date-parent\\">
+                                <Text className=\\"listing-due-date\\">
+                                  <div className=\\"listing-due-date\\" title={[undefined]}>
+                                    <Blueprint2.Icon className=\\"listing-due-icon\\" iconSize={14} icon=\\"time\\">
+                                      <svg className=\\"pt-icon listing-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
                                         <title>
                                           time
                                         </title>
@@ -343,8 +343,8 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                                   <Route path=\\"/academy/missions/3\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
                                     <Link to=\\"/academy/missions/3\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
                                       <a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/3\\">
-                                        <Blueprint2.Button className=\\"mission-info-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
-                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary mission-info-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
+                                        <Blueprint2.Button className=\\"listing-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
+                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary listing-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
                                             <Blueprint2.Icon icon=\\"flame\\">
                                               <svg className=\\"pt-icon\\" style={{...}} data-icon=\\"flame\\" width={16} height={16} viewBox=\\"0 0 16 16\\">
                                                 <title>
@@ -370,33 +370,33 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                       </Blueprint2.Card>
                     </div>
                     <div>
-                      <Blueprint2.Card className=\\"row mission-info\\" elevation={0} interactive={false}>
-                        <div className=\\"pt-card pt-elevation-0 row mission-info\\">
-                          <div className=\\"col-xs-3 mission-info-picture\\">
+                      <Blueprint2.Card className=\\"row listing\\" elevation={0} interactive={false}>
+                        <div className=\\"pt-card pt-elevation-0 row listing\\">
+                          <div className=\\"col-xs-3 listing-picture\\">
                             PICTURE
                           </div>
-                          <div className=\\"col-xs-9 mission-info-text\\">
-                            <div className=\\"row mission-info-title\\">
+                          <div className=\\"col-xs-9 listing-text\\">
+                            <div className=\\"row listing-title\\">
                               <h4>
                                 A closed sidequest
                               </h4>
                             </div>
-                            <div className=\\"row mission-info-order\\">
+                            <div className=\\"row listing-order\\">
                               <h6>
                                 Mission 0 : 123123 XP (hardcoded)
                               </h6>
                             </div>
-                            <div className=\\"row mission-info-description\\">
+                            <div className=\\"row listing-description\\">
                               <p className=\\"col-xs-12\\">
                                 Once upon a time, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nec vulputate sapien. Fusce vel lacus fermentum, efficitur ipsum.
                               </p>
                             </div>
-                            <div className=\\"row between-xs middle-xs mission-info-controls\\">
-                              <div className=\\"col-xs-8 mission-info-due-date-parent\\">
-                                <Text className=\\"mission-info-due-date\\">
-                                  <div className=\\"mission-info-due-date\\" title={[undefined]}>
-                                    <Blueprint2.Icon className=\\"mission-info-due-icon\\" iconSize={14} icon=\\"time\\">
-                                      <svg className=\\"pt-icon mission-info-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
+                            <div className=\\"row between-xs middle-xs listing-controls\\">
+                              <div className=\\"col-xs-8 listing-due-date-parent\\">
+                                <Text className=\\"listing-due-date\\">
+                                  <div className=\\"listing-due-date\\" title={[undefined]}>
+                                    <Blueprint2.Icon className=\\"listing-due-icon\\" iconSize={14} icon=\\"time\\">
+                                      <svg className=\\"pt-icon listing-due-icon\\" style={{...}} data-icon=\\"time\\" width={14} height={14} viewBox=\\"0 0 16 16\\">
                                         <title>
                                           time
                                         </title>
@@ -412,8 +412,8 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
                                   <Route path=\\"/academy/missions/4\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
                                     <Link to=\\"/academy/missions/4\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
                                       <a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/4\\">
-                                        <Blueprint2.Button className=\\"mission-info-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
-                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary mission-info-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
+                                        <Blueprint2.Button className=\\"listing-skip-button\\" minimal={true} intent=\\"primary\\" icon=\\"flame\\">
+                                          <button type=\\"button\\" className=\\"pt-button pt-minimal pt-intent-primary listing-skip-button\\" disabled={[undefined]} onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
                                             <Blueprint2.Icon icon=\\"flame\\">
                                               <svg className=\\"pt-icon\\" style={{...}} data-icon=\\"flame\\" width={16} height={16} viewBox=\\"0 0 16 16\\">
                                                 <title>
@@ -445,7 +445,7 @@ exports[`Missions page with multiple loaded missions renders correctly 1`] = `
           </div>
         </ContentDisplay>
       </div>
-    </Missions>
+    </AssessmentListing>
   </Router>
 </MemoryRouter>"
 `;
diff --git a/src/components/assessment/index.tsx b/src/components/assessment/index.tsx
index c923086512..281602f141 100644
--- a/src/components/assessment/index.tsx
+++ b/src/components/assessment/index.tsx
@@ -13,17 +13,17 @@ export type StateProps = {
   assessment?: IAssessment
 }
 
-export type OwnProps = { missionId: number }
+export type OwnProps = { assessmentId: number }
 
 export type DispatchProps = {
-  handleAssessmentFetch: (missionId: number) => void
+  handleAssessmentFetch: (assessmentId: number) => void
 }
 
 class Assessment extends React.Component<AssessmentProps, { showOverlay: boolean }> {
   public state = { showOverlay: true }
 
   public componentWillMount() {
-    this.props.handleAssessmentFetch(this.props.missionId)
+    this.props.handleAssessmentFetch(this.props.assessmentId)
   }
 
   public render() {
diff --git a/src/containers/academy/MissionsContainer.ts b/src/containers/assessment/AssessmentListingContainer.ts
similarity index 56%
rename from src/containers/academy/MissionsContainer.ts
rename to src/containers/assessment/AssessmentListingContainer.ts
index e764716872..d0b685551a 100644
--- a/src/containers/academy/MissionsContainer.ts
+++ b/src/containers/assessment/AssessmentListingContainer.ts
@@ -3,19 +3,20 @@ import { withRouter } from 'react-router'
 import { bindActionCreators, Dispatch } from 'redux'
 
 import { fetchAssessmentOverviews } from '../../actions/session'
-import Missions, { DispatchProps, StateProps } from '../../components/academy/Missions'
-import {
-  AssessmentCategories,
-  IAssessmentOverview
-} from '../../components/assessment/assessmentShape'
+import AssessmentListing, {
+  DispatchProps,
+  OwnProps,
+  StateProps
+} from '../../components/assessment/AssessmentListing'
+import { IAssessmentOverview } from '../../components/assessment/assessmentShape'
 import { IState } from '../../reducers/states'
 
-const isMission = (x: IAssessmentOverview) => x.category === AssessmentCategories.MISSION
-
-const mapStateToProps: MapStateToProps<StateProps, {}, IState> = state => {
+const mapStateToProps: MapStateToProps<StateProps, OwnProps, IState> = (state, props) => {
+  const categoryFilter = (overview: IAssessmentOverview) =>
+    overview.category === props.assessmentCategory
   return {
     assessmentOverviews: state.session.assessmentOverviews
-      ? state.session.assessmentOverviews.filter(isMission)
+      ? state.session.assessmentOverviews.filter(categoryFilter)
       : undefined
   }
 }
@@ -28,4 +29,4 @@ const mapDispatchToProps: MapDispatchToProps<DispatchProps, {}> = (dispatch: Dis
     dispatch
   )
 
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Missions))
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(AssessmentListing))
diff --git a/src/containers/AssessmentContainer.ts b/src/containers/assessment/index.ts
similarity index 74%
rename from src/containers/AssessmentContainer.ts
rename to src/containers/assessment/index.ts
index 0d7f419fcd..298f0476db 100644
--- a/src/containers/AssessmentContainer.ts
+++ b/src/containers/assessment/index.ts
@@ -1,13 +1,13 @@
 import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux'
 import { bindActionCreators, Dispatch } from 'redux'
 
-import { fetchAssessment } from '../actions/session'
-import Assessment, { DispatchProps, OwnProps, StateProps } from '../components/assessment'
-import { IState } from '../reducers/states'
+import { fetchAssessment } from '../../actions/session'
+import Assessment, { DispatchProps, OwnProps, StateProps } from '../../components/assessment'
+import { IState } from '../../reducers/states'
 
 const mapStateToProps: MapStateToProps<StateProps, OwnProps, IState> = (state, props) => {
   return {
-    assessment: state.session.assessments.get(props.missionId)
+    assessment: state.session.assessments.get(props.assessmentId)
   }
 }
 
diff --git a/src/styles/_academy.scss b/src/styles/_academy.scss
index 888ec50d70..70601f21ee 100644
--- a/src/styles/_academy.scss
+++ b/src/styles/_academy.scss
@@ -17,11 +17,3 @@
     padding: 0.5rem 0 0 0;
   }
 }
-
-.Missions {
-  color: $cadet-color-3;
-  .mission-info {
-    background-color: $cadet-color-5;
-    text-align: justify;
-  }
-}
diff --git a/src/styles/_assessment.scss b/src/styles/_assessment.scss
index 664ab5ec1f..4cbdfba7d3 100644
--- a/src/styles/_assessment.scss
+++ b/src/styles/_assessment.scss
@@ -10,3 +10,11 @@
     margin-top: 1rem;
   }
 }
+
+.AssessmentListing {
+  color: $cadet-color-3;
+  .listing {
+    background-color: $cadet-color-5;
+    text-align: justify;
+  }
+}