organization & name changes

organization & name changes