naming & restructuring