Rename the last bits to SmartClient