Updates to reflect name changes -- and fixed some template bugs