Changing to Java naming conventions so my eyes don't bleed so much