It doesn't matter. Seriously. It doesn't. It is not so important how they are 'defined': they are what comes out when we are 'filled with the Spirit'. We usually ignore the previous verse when discussing Ephesians 5:19. Verses 19-21 are the result of a spirit-filled life. We should argue about who is filled with the Spirit when they sing, not what they sing!