Removed '-image' from function names.

This addresses issue #22.