RE: [NF] back to naming conventions