Major refactoring: Use aliases in quad map creation