Additional conditional in order to differentiate naming schemes