I don't think you're right. I won't pretend to be an expert on any of this, but as a speaker of modern Greek I can confidently say that λαβύρινθος (labyrinth) is the only word in Greek to describe both your definition of a labyrinth and a maze.
For example, this Wikipedia article[1] on labyrinth in Greek, which has the picture [2] of a maze and calls it a labyrinth.
