a few minor naming and org changes