Dev:Sprints/2013-01-07 Reworked Terminology