Adjust colliding generated class names - Fix #129

Another possibility for fixing #129. I don't know why putting the parent layer name in the module name breaks the order in which setups run, but just munging the name a bit doesn't appear to, so maybe we should do this instead?