Updated files to be consistent with new name.