Fixed horrible naming convention