Maze generation 2

Cleanup, name changes.