Refactoring on concepts-related classes (mainly renames)