Rename solved-location? to solved?