finalize naming and return structure... hopefully.

Renaming functions, and trying to get this into order for a real release