edit for naming convention consistency