Handling names and getting rid of somewhat useless ImageBaker class