Attached is a patch that replaces instances of outline-regexp 
by org-outline-regexp.  It also introduces more harmonization.

I'd be interesed in hearing about feedback.

Thanks!