Use filename abstraction in subgenerators