Abstract naming convention and KNN weighting bugfix.