Rather complete review, including namespace change.