Fixed to accept multiple naming schemes