fixing naming in generation