Get the naming in order better in the source builder