Fix capitalisation and clean up server calls