Edit for naming style consistency