Fix: name enforcing bug