Working on Fuel API. Minor name tweaks.