Consistent concepts of self-organization and self-assembly