Fixed numerous bugs and naming issues

Renamed DEFAULT to GLOBAL to prevent default value conflicts