S5407 | Updates terminology and corrects citations | Smith & Moses