Rename solutions to prevent data type confusion