Fix compareTo bug. Fix more naming issues