Just renaming some classes for better name consistency across the project
merged
mentioned in commit ba2567b0