Rename "Client" to "Controller"