modified property names from Manatee to Spitfire; still trying to fix tests