Fixed safe_name references