cleanups. Worked out alias scheme for 'foo2baz' <=> 'foo2ImageOfBar'