Replace 'val call with constant and fix capitalization