Optimizations for DEFAULT compatibility
Fixed inconsistent definition naming