fixed little naming convention violence