Solution and project names refactored