Renaming and restructuralization of solutions according to Thesis text