Refactor on variable names to more closely match new JSON and prep for improvements to rendering/deleting pointables