Fix names.
Amend.
Reorder targets.
Fix names.
Update qt-client.