Fix up some of the naming to be more consisten about what elements are.  Also fixes is so I am not doing a 2x load on the inital project listing pages.