Generalise the maker environment export a little

This is going to be really useful I think...
Support renaming of objects on export