Minor rename in cluster model
Started LDA refactor