Solution naming refactored