Applied small refactoring and renaming in solution