some renaming per Justin's comments